Page MenuHomeFreeBSD
Differential D2657

memmem(3): empty little string matches the beginning of big
ClosedPublic
Actions

Authored by emaste on May 26 2015, 6:19 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 29, 5:15 AM
Unknown Object (File)
Mar 2 2025, 4:01 PM
Unknown Object (File)
Jan 24 2025, 10:35 PM
Unknown Object (File)
Jan 15 2025, 11:56 AM
Unknown Object (File)
Jan 15 2025, 11:18 AM
Unknown Object (File)
Jan 9 2025, 10:19 PM
Unknown Object (File)
Jan 9 2025, 9:55 PM
Unknown Object (File)
Jan 9 2025, 9:48 PM
View All Files
Subscribers
None

Details

Reviewers
jilles
ngie
bapt
Group Reviewers
manpages
Commits
rS283584: memmem(3): empty little string matches the beginning of the big string
Summary

This function originated in glibc, and this matches the behaviour of their implementation.

An empty big string (arg "l") is handled by the existing l_len < s_len test.

Test Plan

kyua test lib/libc/string/memmem:memmem_basic

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste updated this revision to Diff 5711.May 26 2015, 6:19 PM
emaste retitled this revision from to memmem(3): empty little string matches the beginning of big.
emaste updated this object.
emaste edited the test plan for this revision. (Show Details)
emaste added reviewers: ngie, bapt, jilles.
ngie accepted this revision.May 26 2015, 6:43 PM
ngie edited edge metadata.

LGTM:

$ cat /etc/redhat-release 
Fedora release 20 (Heisenbug)
$ ./test_memmem ; echo $?
0
$ cat test_memmem.c 
#define	_GNU_SOURCE
#include <assert.h>
#include <string.h>

char p0[] = "";
int lp0 = 0;
char b0[] = "";
int lb0 = 0;
char b2[] = "0123456789";
int lb2 = 10;

int
main(void)
{

	assert(memmem(b2, lb2, p0, lp0) == b2);
	assert(memmem(b0, lb0, p0, lp0) == b0);

	return 0;
}
This revision is now accepted and ready to land.May 26 2015, 6:43 PM
emaste added a comment.May 26 2015, 6:54 PM

For reference, NetBSD, OpenBSD and musl share the "new" behaviour (with this change) with glibc
OS X and DragonFly have the "old" behaviour

emaste updated this revision to Diff 5713.May 26 2015, 6:55 PM
emaste edited edge metadata.

Update cast as in OpenBSD

This revision now requires review to proceed.May 26 2015, 6:55 PM
emaste updated this revision to Diff 5714.May 26 2015, 7:15 PM
emaste edited edge metadata.

update man page too

emaste added a reviewer: manpages.May 26 2015, 7:15 PM
emaste added a child revision: D2601: libc: Use musl's O(n) memmem and strstr.May 26 2015, 8:04 PM
bapt accepted this revision.May 26 2015, 8:06 PM
bapt edited edge metadata.
This revision is now accepted and ready to land.May 26 2015, 8:06 PM
Closed by commit rS283584: memmem(3): empty little string matches the beginning of the big string (authored by emaste). · Explain WhyMay 26 2015, 9:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
contrib/
netbsd-tests/
lib/
libc/
string/
2 lines
lib/
libc/
string/
22 lines
6 lines

Diff 5714

View Options

contrib/netbsd-tests/lib/libc/string/t_memmem.c

# $FreeBSD$ # $FreeBSD$
PORTNAME= ktp-call-ui PORTNAME= ktp-call-ui
DISTVERSION= ${KDE_APPLICATIONS_VERSION} DISTVERSION= ${KDE_APPLICATIONS_VERSION}
CATEGORIES= net-im kde kde-applications CATEGORIES= net-im kde kde-applications
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= Voice/Video Call UI for Telepathy COMMENT= Voice/Video Call UI for Telepathy
LIB_DEPENDS= libKTpCommonInternals.so:net-im/ktp-common-internals \ LIB_DEPENDS= libKTpCommonInternals.so:net-im/ktp-common-internals \
libQt5GStreamer-1.0.so:multimedia/gstreamer1-qt@qt5 \ libQt5GStreamer-1.0.so:multimedia/gstreamer1-qt@qt5 \
libboost_thread.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs \
libfarstream-0.2.so:net-im/farstream \ libfarstream-0.2.so:net-im/farstream \
libtelepathy-farstream.so:net-im/telepathy-farstream \ libtelepathy-farstream.so:net-im/telepathy-farstream \
libtelepathy-glib.so:net-im/telepathy-glib \ libtelepathy-glib.so:net-im/telepathy-glib \
libtelepathy-qt5-farstream.so:net-im/telepathy-qt5 libtelepathy-qt5-farstream.so:net-im/telepathy-qt@qt5
USES= cmake:outsource compiler:c++11-lang gettext kde:5 pkgconfig \ USES= cmake:outsource compiler:c++11-lang gettext kde:5 pkgconfig \
python:2.7 qt:5 tar:xz python:2.7 qt:5 tar:xz
USE_GNOME= glib20 USE_GNOME= glib20
USE_KDE= auth codecs config configwidgets coreaddons ecm iconthemes \ USE_KDE= auth codecs config configwidgets coreaddons ecm iconthemes \
i18n kcmutils kdeclarative notifications package service \ i18n kcmutils kdeclarative notifications package service \
wallet widgetsaddons xmlgui wallet widgetsaddons xmlgui
USE_QT= core dbus gui network qml quick widgets xml \ USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build buildtools_build qmake_build
USE_LDCONFIG= yes USE_LDCONFIG= yes
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

lib/libc/string/memmem.3

# $FreeBSD$ # $FreeBSD$
PORTNAME= ktp-call-ui PORTNAME= ktp-call-ui
DISTVERSION= ${KDE_APPLICATIONS_VERSION} DISTVERSION= ${KDE_APPLICATIONS_VERSION}
CATEGORIES= net-im kde kde-applications CATEGORIES= net-im kde kde-applications
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= Voice/Video Call UI for Telepathy COMMENT= Voice/Video Call UI for Telepathy
LIB_DEPENDS= libKTpCommonInternals.so:net-im/ktp-common-internals \ LIB_DEPENDS= libKTpCommonInternals.so:net-im/ktp-common-internals \
libQt5GStreamer-1.0.so:multimedia/gstreamer1-qt@qt5 \ libQt5GStreamer-1.0.so:multimedia/gstreamer1-qt@qt5 \
libboost_thread.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs \
libfarstream-0.2.so:net-im/farstream \ libfarstream-0.2.so:net-im/farstream \
libtelepathy-farstream.so:net-im/telepathy-farstream \ libtelepathy-farstream.so:net-im/telepathy-farstream \
libtelepathy-glib.so:net-im/telepathy-glib \ libtelepathy-glib.so:net-im/telepathy-glib \
libtelepathy-qt5-farstream.so:net-im/telepathy-qt5 libtelepathy-qt5-farstream.so:net-im/telepathy-qt@qt5
USES= cmake:outsource compiler:c++11-lang gettext kde:5 pkgconfig \ USES= cmake:outsource compiler:c++11-lang gettext kde:5 pkgconfig \
python:2.7 qt:5 tar:xz python:2.7 qt:5 tar:xz
USE_GNOME= glib20 USE_GNOME= glib20
USE_KDE= auth codecs config configwidgets coreaddons ecm iconthemes \ USE_KDE= auth codecs config configwidgets coreaddons ecm iconthemes \
i18n kcmutils kdeclarative notifications package service \ i18n kcmutils kdeclarative notifications package service \
wallet widgetsaddons xmlgui wallet widgetsaddons xmlgui
USE_QT= core dbus gui network qml quick widgets xml \ USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build buildtools_build qmake_build
USE_LDCONFIG= yes USE_LDCONFIG= yes
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

lib/libc/string/memmem.c

# $FreeBSD$ # $FreeBSD$
PORTNAME= ktp-call-ui PORTNAME= ktp-call-ui
DISTVERSION= ${KDE_APPLICATIONS_VERSION} DISTVERSION= ${KDE_APPLICATIONS_VERSION}
CATEGORIES= net-im kde kde-applications CATEGORIES= net-im kde kde-applications
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org
COMMENT= Voice/Video Call UI for Telepathy COMMENT= Voice/Video Call UI for Telepathy
LIB_DEPENDS= libKTpCommonInternals.so:net-im/ktp-common-internals \ LIB_DEPENDS= libKTpCommonInternals.so:net-im/ktp-common-internals \
libQt5GStreamer-1.0.so:multimedia/gstreamer1-qt@qt5 \ libQt5GStreamer-1.0.so:multimedia/gstreamer1-qt@qt5 \
libboost_thread.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs \
libfarstream-0.2.so:net-im/farstream \ libfarstream-0.2.so:net-im/farstream \
libtelepathy-farstream.so:net-im/telepathy-farstream \ libtelepathy-farstream.so:net-im/telepathy-farstream \
libtelepathy-glib.so:net-im/telepathy-glib \ libtelepathy-glib.so:net-im/telepathy-glib \
libtelepathy-qt5-farstream.so:net-im/telepathy-qt5 libtelepathy-qt5-farstream.so:net-im/telepathy-qt@qt5
USES= cmake:outsource compiler:c++11-lang gettext kde:5 pkgconfig \ USES= cmake:outsource compiler:c++11-lang gettext kde:5 pkgconfig \
python:2.7 qt:5 tar:xz python:2.7 qt:5 tar:xz
USE_GNOME= glib20 USE_GNOME= glib20
USE_KDE= auth codecs config configwidgets coreaddons ecm iconthemes \ USE_KDE= auth codecs config configwidgets coreaddons ecm iconthemes \
i18n kcmutils kdeclarative notifications package service \ i18n kcmutils kdeclarative notifications package service \
wallet widgetsaddons xmlgui wallet widgetsaddons xmlgui
USE_QT= core dbus gui network qml quick widgets xml \ USE_QT= core dbus gui network qml quick widgets xml \
buildtools_build qmake_build buildtools_build qmake_build
USE_LDCONFIG= yes USE_LDCONFIG= yes
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS
.include <bsd.port.mk> .include <bsd.port.mk>