diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | argp/argp.h | 6 | ||||
| -rw-r--r-- | stdlib/xpg_basename.c | 5 |
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 17d7b4d23f..6f20754bb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 1999-10-10 Ulrich Drepper <drepper@cygnus.com> + * stdlib/xpg_basename.c (__xpg_basename): Don't return pointer to + slash before the basename [PR libc/1383]. + + * argp/argp.h: Fix typo in last patch. + * sysdeps/powerpc/sysdep.h: New file. * sysdeps/unix/powerpc/sysdep.h: New file. * sysdeps/unix/sysv/linux/powerpc/sysdep.h: Include diff --git a/argp/argp.h b/argp/argp.h index adfc3e669f..0d40572963 100644 --- a/argp/argp.h +++ b/argp/argp.h @@ -445,9 +445,9 @@ extern error_t argp_err_exit_status; extern void argp_help (__const struct argp *__restrict __argp, FILE *__restrict __stream, unsigned __flags, char *__restrict __name) __THROW; -extern void __argp_help __P (__const struct argp *__restrict __argp, - FILE *__restrict __stream, unsigned __flags, - char *__name) __THROW; +extern void __argp_help (__const struct argp *__restrict __argp, + FILE *__restrict __stream, unsigned __flags, + char *__name) __THROW; /* The following routines are intended to be called from within an argp parsing routine (thus taking an argp_state structure as the first diff --git a/stdlib/xpg_basename.c b/stdlib/xpg_basename.c index b789bc9a1a..0e36807165 100644 --- a/stdlib/xpg_basename.c +++ b/stdlib/xpg_basename.c @@ -1,5 +1,5 @@ /* Return basename of given pathname according to the weird XPG specification. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -62,6 +62,9 @@ __xpg_basename (char *filename) while (p[1] != '\0') ++p; } + else + /* Go to the first character of the name. */ + ++p; } } |