aboutsummaryrefslogtreecommitdiff
path: root/stdlib
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-04-17 15:10:04 +0000
committerUlrich Drepper <drepper@redhat.com>1997-04-17 15:10:04 +0000
commitdd33e89fb2693e88ba64e6b947184c5abf70ff00 (patch)
tree3a621cf04df476aa6dd7905c41e77e8133baae3e /stdlib
parent7799b7b3350fdcadc6dfb8821fb49b7772c96701 (diff)
downloadglibc-dd33e89fb2693e88ba64e6b947184c5abf70ff00.zip
glibc-dd33e89fb2693e88ba64e6b947184c5abf70ff00.tar.gz
glibc-dd33e89fb2693e88ba64e6b947184c5abf70ff00.tar.bz2
Update.
1997-04-17 16:55 Ulrich Drepper <drepper@cygnus.com> * misc/libgen.h: Change prototype for of basename to XPG variant. * stdlib/Makefile (routines): Add xpg_basename. * stdlib/basename.c: New file. * string/string.h: Don't declare basename function if basename macro is available. 1997-04-16 17:33 Miles Bader <miles@gnu.ai.mit.edu> * login/utmp_file.c (proc_utmp_eq): Only use ut_id field if valid. 1997-04-15 12:47 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/fclrexcpt.c: New file. * sysdeps/m68k/fpu/fenvbits.h: New file. * sysdeps/m68k/fpu/fegetenv.c: New file. * sysdeps/m68k/fpu/fegetround.c: New file. * sysdeps/m68k/fpu/fesetenv.c: New file. * sysdeps/m68k/fpu/fesetround.c: New file. * sysdeps/m68k/fpu/feupdateenv.c: New file. * sysdeps/m68k/fpu/fgetexcptflg.c: New file. * sysdeps/m68k/fpu/fraiseexcpt.c: New file. * sysdeps/m68k/fpu/fsetexcptflg.c: New file. * sysdeps/m68k/fpu/ftestexcept.c: New file. * sysdeps/m68k/fpu/mathbits.h: New file. * sysdeps/m68k/fpu/s_remquo.c: New file. * sysdeps/m68k/fpu/s_remquol.c: New file. * sysdeps/m68k/fpu/s_remquof.c: New file. * sysdeps/libm-ieee754/s_roundl.c: Restore integer bit when mantissa overflows into exponent. Fix priority of >> vs +. * math/libm-test.c (basic_tests): Use the appropriate isnan and isinf function to test the value of the nan function. 1997-04-15 13:40 Ulrich Drepper <drepper@cygnus.com> * sysdeps/libm-i387/s_finite.S: Fix typo. * sysdeps/i386/fpu/__math.h: Add optimized versions of isgreater, isgreaterequal, isless, islessequal, islessgreater, and isunordered.
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/Makefile2
-rw-r--r--stdlib/xpg_basename.c69
2 files changed, 70 insertions, 1 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile
index a9e22ac..7e70e5a 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -42,7 +42,7 @@ routines := \
strtof strtod strtold \
system canonicalize \
a64l l64a \
- rpmatch strfmon strfmon_l getsubopt
+ rpmatch strfmon strfmon_l getsubopt xpg_basename
distribute := exit.h grouping.h abort-instr.h
tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
diff --git a/stdlib/xpg_basename.c b/stdlib/xpg_basename.c
new file mode 100644
index 0000000..b789bc9
--- /dev/null
+++ b/stdlib/xpg_basename.c
@@ -0,0 +1,69 @@
+/* Return basename of given pathname according to the weird XPG specification.
+ Copyright (C) 1997 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <string.h>
+#include <libgen.h>
+
+
+char *
+__xpg_basename (char *filename)
+{
+ char *p;
+
+ if (filename == NULL || filename[0] == '\0')
+ /* We return a pointer to a static string containing ".". */
+ p = (char *) ".";
+ else
+ {
+ p = strrchr (filename, '/');
+
+ if (p == NULL)
+ /* There is no slash in the filename. Return the whole string. */
+ p = filename;
+ else
+ {
+ if (p[1] == '\0')
+ {
+ /* We must remove trailing '/'. */
+ while (p > filename && p[-1] == '/')
+ --p;
+
+ /* Now we can be in two situations:
+ a) the string only contains '/' characters, so we return
+ '/'
+ b) p points past the last component, but we have to remove
+ the trailing slash. */
+ if (p > filename)
+ {
+ *p-- = '\0';
+ while (p > filename && p[-1] != '/')
+ --p;
+ }
+ else
+ /* The last slash we already found is the right position
+ to return. */
+ while (p[1] != '\0')
+ ++p;
+ }
+ }
+ }
+
+ return p;
+}