Date: Sun, 26 Sep 2010 12:52:23 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r213184 - in stable/8: include lib/libc/gen Message-ID: <201009261252.o8QCqNs2093253@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Sun Sep 26 12:52:23 2010 New Revision: 213184 URL: http://svn.freebsd.org/changeset/base/213184 Log: Revert r213002. Modified: stable/8/include/libgen.h stable/8/lib/libc/gen/Makefile.inc stable/8/lib/libc/gen/Symbol.map stable/8/lib/libc/gen/basename.3 stable/8/lib/libc/gen/basename.c Modified: stable/8/include/libgen.h ============================================================================== --- stable/8/include/libgen.h Sun Sep 26 10:39:01 2010 (r213183) +++ stable/8/include/libgen.h Sun Sep 26 12:52:23 2010 (r213184) @@ -36,7 +36,6 @@ __BEGIN_DECLS char *basename(const char *); -char *basename_r(const char *, char *); char *dirname(const char *); #if 0 char *regcmp(const char *, ...); Modified: stable/8/lib/libc/gen/Makefile.inc ============================================================================== --- stable/8/lib/libc/gen/Makefile.inc Sun Sep 26 10:39:01 2010 (r213183) +++ stable/8/lib/libc/gen/Makefile.inc Sun Sep 26 12:52:23 2010 (r213184) @@ -77,7 +77,6 @@ MAN+= alarm.3 arc4random.3 \ MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3 \ arc4random.3 arc4random_buf.3 arc4random.3 arc4random_uniform.3 -MLINKS+=basename.3 basename_r.3 MLINKS+=ctermid.3 ctermid_r.3 MLINKS+=devname.3 devname_r.3 MLINKS+=devname.3 fdevname.3 Modified: stable/8/lib/libc/gen/Symbol.map ============================================================================== --- stable/8/lib/libc/gen/Symbol.map Sun Sep 26 10:39:01 2010 (r213183) +++ stable/8/lib/libc/gen/Symbol.map Sun Sep 26 12:52:23 2010 (r213184) @@ -366,7 +366,6 @@ FBSD_1.1 { }; FBSD_1.2 { - basename_r; getpagesizes; }; Modified: stable/8/lib/libc/gen/basename.3 ============================================================================== --- stable/8/lib/libc/gen/basename.3 Sun Sep 26 10:39:01 2010 (r213183) +++ stable/8/lib/libc/gen/basename.3 Sun Sep 26 12:52:23 2010 (r213184) @@ -27,7 +27,7 @@ .\" $OpenBSD: basename.3,v 1.12 2000/04/18 03:01:25 aaron Exp $ .\" $FreeBSD$ .\" -.Dd October 6, 2009 +.Dd October 12, 2006 .Dt BASENAME 3 .Os .Sh NAME @@ -37,8 +37,6 @@ .In libgen.h .Ft char * .Fn basename "const char *path" -.Ft char * -.Fn basename_r "const char *path" "char *bname" .Sh DESCRIPTION The .Fn basename @@ -60,12 +58,6 @@ If is a null pointer or the empty string, a pointer to the string .Qq \&. is returned. -.Pp -The -.Fn basename_r -variation accepts a buffer of at least -.Dv MAXPATHLEN -bytes in which to store the resulting component. .Sh IMPLEMENTATION NOTES The .Fn basename @@ -73,17 +65,15 @@ function returns a pointer to internal storage space allocated on the first call that will be overwritten by subsequent calls. -.Fn basename_r -is therefore preferred for threaded applications. .Sh RETURN VALUES On successful completion, .Fn basename -and -.Fn basename_r -return pointers to the last component of +returns a pointer to the last component of .Fa path . .Pp -If they fail, a null pointer is returned and the global variable +If +.Fn basename +fails, a null pointer is returned and the global variable .Va errno is set to indicate the error. .Sh ERRORS Modified: stable/8/lib/libc/gen/basename.c ============================================================================== --- stable/8/lib/libc/gen/basename.c Sun Sep 26 10:39:01 2010 (r213183) +++ stable/8/lib/libc/gen/basename.c Sun Sep 26 12:52:23 2010 (r213184) @@ -40,12 +40,18 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> char * -basename_r(path, bname) +basename(path) const char *path; - char *bname; { + static char *bname = NULL; const char *endp, *startp; + if (bname == NULL) { + bname = (char *)malloc(MAXPATHLEN); + if (bname == NULL) + return(NULL); + } + /* Empty or NULL string gets treated as "." */ if (path == NULL || *path == '\0') { (void)strcpy(bname, "."); @@ -76,17 +82,3 @@ basename_r(path, bname) bname[endp - startp + 1] = '\0'; return(bname); } - -char * -basename(path) - const char *path; -{ - static char *bname = NULL; - - if (bname == NULL) { - bname = (char *)malloc(MAXPATHLEN); - if (bname == NULL) - return (NULL); - } - return (basename_r(path, bname)); -}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009261252.o8QCqNs2093253>