Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

guard single-dot from modification by the application 

(SUSv3 spec don't forbid this brutal operation).
this idea taken from OpenBSD's version of basename(3) and dirname(3).
This commit is contained in:
tnozaki 2009-11-24 13:34:20 +00:00
parent b95326704e
commit 3f8ca7c44a
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libc/gen/basename.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: basename.c,v 1.8 2008/05/10 22:39:40 christos Exp $ */
/* $NetBSD: basename.c,v 1.9 2009/11/24 13:34:20 tnozaki Exp $ */
/*-
* Copyright (c) 1997, 2002 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: basename.c,v 1.8 2008/05/10 22:39:40 christos Exp $");
__RCSID("$NetBSD: basename.c,v 1.9 2009/11/24 13:34:20 tnozaki Exp $");
#endif /* !LIBC_SCCS && !lint */
#include "namespace.h"
@ -47,7 +47,6 @@ __weak_alias(basename,_basename)
char *
basename(char *path)
{
static char singledot[] = ".";
static char result[PATH_MAX];
const char *p, *lastp;
size_t len;
@ -56,8 +55,12 @@ basename(char *path)
* If `path' is a null pointer or points to an empty string,
* return a pointer to the string ".".
*/
if ((path == NULL) || (*path == '\0'))
return (singledot);
if ((path == NULL) || (*path == '\0')) {
result[0] = '.';
result[1] = '\0';
return (result);
}
/* Strip trailing slashes, if any. */
lastp = path + strlen(path) - 1;

14
lib/libc/gen/dirname.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dirname.c,v 1.10 2008/05/10 22:39:40 christos Exp $ */
/* $NetBSD: dirname.c,v 1.11 2009/11/24 13:34:20 tnozaki Exp $ */
/*-
* Copyright (c) 1997, 2002 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: dirname.c,v 1.10 2008/05/10 22:39:40 christos Exp $");
__RCSID("$NetBSD: dirname.c,v 1.11 2009/11/24 13:34:20 tnozaki Exp $");
#endif /* !LIBC_SCCS && !lint */
#include "namespace.h"
@ -47,7 +47,6 @@ __weak_alias(dirname,_dirname)
char *
dirname(char *path)
{
static char singledot[] = ".";
static char result[PATH_MAX];
const char *lastp;
size_t len;
@ -57,7 +56,8 @@ dirname(char *path)
* return a pointer to the string ".".
*/
if ((path == NULL) || (*path == '\0'))
return (singledot);
goto singledot;
/* Strip trailing slashes, if any. */
lastp = path + strlen(path) - 1;
@ -84,6 +84,10 @@ dirname(char *path)
} while (--lastp >= path);
/* No /'s found, return a pointer to the string ".". */
return (singledot);
singledot:
result[0] = '.';
result[1] = '\0';
return (result);
}
#endif