Index: head/include/libgen.h =================================================================== --- head/include/libgen.h (revision 303450) +++ head/include/libgen.h (revision 303451) @@ -1,42 +1,42 @@ /* $OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $ */ /* $FreeBSD$ */ /* * Copyright (c) 1997 Todd C. Miller * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef _LIBGEN_H_ #define _LIBGEN_H_ #include __BEGIN_DECLS -char *basename(const char *); +char *basename(char *); char *basename_r(const char *, char *); -char *dirname(const char *); +char *dirname(char *); __END_DECLS #endif /* !_LIBGEN_H_ */ Index: head/lib/libc/gen/basename.3 =================================================================== --- head/lib/libc/gen/basename.3 (revision 303450) +++ head/lib/libc/gen/basename.3 (revision 303451) @@ -1,113 +1,113 @@ .\" $OpenBSD: basename.3,v 1.20 2007/05/31 19:19:28 jmc Exp $ .\" .\" Copyright (c) 1997 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above .\" copyright notice and this permission notice appear in all copies. .\" .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" $FreeBSD$ .\" -.Dd March 31, 2010 +.Dd July 28, 2016 .Dt BASENAME 3 .Os .Sh NAME .Nm basename .Nd extract the base portion of a pathname .Sh SYNOPSIS .In libgen.h .Ft char * -.Fn basename "const char *path" +.Fn basename "char *path" .Ft char * .Fn basename_r "const char *path" "char *bname" .Sh DESCRIPTION The .Fn basename function returns the last component from the pathname pointed to by .Fa path , deleting any trailing .Sq \&/ characters. If .Fa path consists entirely of .Sq \&/ characters, a pointer to the string .Qq \&/ is returned. If .Fa path 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 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 .Fa path . .Pp If they fail, a null pointer is returned and the global variable .Va errno is set to indicate the error. .Sh ERRORS The following error codes may be set in .Va errno : .Bl -tag -width Er .It Bq Er ENAMETOOLONG The path component to be returned was larger than .Dv MAXPATHLEN . .El .Sh SEE ALSO .Xr basename 1 , .Xr dirname 1 , .Xr dirname 3 .Sh STANDARDS The .Fn basename function conforms to .St -xpg4.2 . .Sh HISTORY The .Fn basename function first appeared in .Ox 2.2 and .Fx 4.2 . .Sh AUTHORS .An Todd C. Miller .Sh CAVEATS .Fn basename returns a pointer to internal static storage space that will be overwritten by subsequent calls. .Pp Other vendor implementations of .Fn basename may modify the contents of the string passed to .Fn basename ; this should be taken into account when writing code which calls this function if portability is desired. Index: head/lib/libc/gen/basename.c =================================================================== --- head/lib/libc/gen/basename.c (revision 303450) +++ head/lib/libc/gen/basename.c (revision 303451) @@ -1,79 +1,79 @@ /* $OpenBSD: basename.c,v 1.14 2005/08/08 08:05:33 espie Exp $ */ /* * Copyright (c) 1997, 2004 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include char * basename_r(const char *path, char *bname) { const char *endp, *startp; size_t len; /* Empty or NULL string gets treated as "." */ if (path == NULL || *path == '\0') { bname[0] = '.'; bname[1] = '\0'; return (bname); } /* Strip any trailing slashes */ endp = path + strlen(path) - 1; while (endp > path && *endp == '/') endp--; /* All slashes becomes "/" */ if (endp == path && *endp == '/') { bname[0] = '/'; bname[1] = '\0'; return (bname); } /* Find the start of the base */ startp = endp; while (startp > path && *(startp - 1) != '/') startp--; len = endp - startp + 1; if (len >= MAXPATHLEN) { errno = ENAMETOOLONG; return (NULL); } memcpy(bname, startp, len); bname[len] = '\0'; return (bname); } char * -basename(const char *path) +basename(char *path) { static char *bname = NULL; if (bname == NULL) { bname = (char *)malloc(MAXPATHLEN); if (bname == NULL) return (NULL); } return (basename_r(path, bname)); } Index: head/lib/libc/gen/dirname.3 =================================================================== --- head/lib/libc/gen/dirname.3 (revision 303450) +++ head/lib/libc/gen/dirname.3 (revision 303451) @@ -1,99 +1,99 @@ .\" $OpenBSD: dirname.3,v 1.17 2007/05/31 19:19:28 jmc Exp $ .\" .\" Copyright (c) 1997 Todd C. Miller .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above .\" copyright notice and this permission notice appear in all copies. .\" .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR .\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" $FreeBSD$ .\" -.Dd October 12, 2006 +.Dd July 28, 2016 .Dt DIRNAME 3 .Os .Sh NAME .Nm dirname .Nd extract the directory part of a pathname .Sh SYNOPSIS .In libgen.h .Ft char * -.Fn dirname "const char *path" +.Fn dirname "char *path" .Sh DESCRIPTION The .Fn dirname function is the converse of .Xr basename 3 ; it returns a pointer to the parent directory of the pathname pointed to by .Fa path . Any trailing .Sq \&/ characters are not counted as part of the directory name. If .Fa path is a null pointer, the empty string, or contains no .Sq \&/ characters, .Fn dirname returns a pointer to the string .Qq \&. , signifying the current directory. .Sh IMPLEMENTATION NOTES The .Fn dirname function returns a pointer to internal storage space allocated on the first call that will be overwritten by subsequent calls. .Pp Other vendor implementations of .Fn dirname may modify the contents of the string passed to .Fn dirname ; this should be taken into account when writing code which calls this function if portability is desired. .Sh RETURN VALUES On successful completion, .Fn dirname returns a pointer to the parent directory of .Fa path . .Pp If .Fn dirname fails, a null pointer is returned and the global variable .Va errno is set to indicate the error. .Sh ERRORS The following error codes may be set in .Va errno : .Bl -tag -width Er .It Bq Er ENAMETOOLONG The path component to be returned was larger than .Dv MAXPATHLEN . .El .Sh SEE ALSO .Xr basename 1 , .Xr dirname 1 , .Xr basename 3 .Sh STANDARDS The .Fn dirname function conforms to .St -xpg4.2 . .Sh HISTORY The .Fn dirname function first appeared in .Ox 2.2 and .Fx 4.2 . .Sh AUTHORS .An "Todd C. Miller" Index: head/lib/libc/gen/dirname.c =================================================================== --- head/lib/libc/gen/dirname.c (revision 303450) +++ head/lib/libc/gen/dirname.c (revision 303451) @@ -1,77 +1,77 @@ /* $OpenBSD: dirname.c,v 1.13 2005/08/08 08:05:33 espie Exp $ */ /* * Copyright (c) 1997, 2004 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include char * -dirname(const char *path) +dirname(char *path) { static char *dname = NULL; size_t len; const char *endp; if (dname == NULL) { dname = (char *)malloc(MAXPATHLEN); if (dname == NULL) return(NULL); } /* Empty or NULL string gets treated as "." */ if (path == NULL || *path == '\0') { dname[0] = '.'; dname[1] = '\0'; return (dname); } /* Strip any trailing slashes */ endp = path + strlen(path) - 1; while (endp > path && *endp == '/') endp--; /* Find the start of the dir */ while (endp > path && *endp != '/') endp--; /* Either the dir is "/" or there are no slashes */ if (endp == path) { dname[0] = *endp == '/' ? '/' : '.'; dname[1] = '\0'; return (dname); } else { /* Move forward past the separating slashes */ do { endp--; } while (endp > path && *endp == '/'); } len = endp - path + 1; if (len >= MAXPATHLEN) { errno = ENAMETOOLONG; return (NULL); } memcpy(dname, path, len); dname[len] = '\0'; return (dname); }