2005-04-08 Jeff Johnston <jjohnstn@redhat.com>

        * libc/include/libgen.h: New file.

2005-04-08  Shaun Jackman  <sjackman@gmail.com>

        * libc/unix/Makefile.am: Add support for basename and dirname.
        * libc/unix/Makefile.in: Regenerated.
        * libc/unix/basename.c: New file.
        * libc/unix/dirname.c: New file.

5 files changed, 79 insertions, 1 deletions

diff --git a/newlib/libc/include/libgen.h b/newlib/libc/include/libgen.h
new file mode 100644
index 000000000..abfab0e5c
--- /dev/null
+++ b/newlib/libc/include/libgen.h
@@ -0,0 +1,23 @@
+/*
+ * libgen.h - defined by XPG4
+ */
+
+#ifndef _LIBGEN_H_
+#define _LIBGEN_H_
+
+#include "_ansi.h"
+#include <sys/reent.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char      *_EXFUN(basename,     (char *));
+char      *_EXFUN(dirname,     (char *));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _LIBGEN_H_ */
+
diff --git a/newlib/libc/unix/Makefile.am b/newlib/libc/unix/Makefile.am
index a5d57cf87..6ecee1397 100644
--- a/newlib/libc/unix/Makefile.am
+++ b/newlib/libc/unix/Makefile.am
@@ -15,6 +15,8 @@ ELIX_2_OBJS = \
 	ttyname.$(oext)
 
 ELIX_4_OBJS = \
+	basename.$(oext)	\
+	dirname.$(oext)		\
 	getlogin.$(oext)	\
 	getpass.$(oext) 	\
 	getpwent.$(oext) 	\
diff --git a/newlib/libc/unix/Makefile.in b/newlib/libc/unix/Makefile.in
index a3bb1b02e..7d049ce14 100644
--- a/newlib/libc/unix/Makefile.in
+++ b/newlib/libc/unix/Makefile.in
@@ -116,7 +116,7 @@ GENERAL_SOURCES =  	getcwd.c 		pread.c 		pwrite.c 		sigset.c
 ELIX_2_OBJS =  	ttyname.$(oext)
 
 
-ELIX_4_OBJS =  	getlogin.$(oext)		getpass.$(oext) 		getpwent.$(oext) 		getut.$(oext)
+ELIX_4_OBJS =  	basename.$(oext)		dirname.$(oext)			getlogin.$(oext)		getpass.$(oext) 		getpwent.$(oext) 		getut.$(oext)
 
 @ELIX_LEVEL_1_TRUE@LIB_OBJS = 
 @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
diff --git a/newlib/libc/unix/basename.c b/newlib/libc/unix/basename.c
new file mode 100644
index 000000000..703e532d5
--- /dev/null
+++ b/newlib/libc/unix/basename.c
@@ -0,0 +1,25 @@
+/* Copyright 2005 Shaun Jackman
+ * Permission to use, copy, modify, and distribute this software
+ * is freely granted, provided that this notice is preserved.
+ */
+
+#include <libgen.h>
+#include <string.h>
+
+char* 
+_DEFUN (basename, (path),
+	char *path)
+{
+	char *p;
+	if( path == NULL || *path == '\0' )
+		return ".";
+	p = path + strlen(path) - 1;
+	while( *p == '/' ) {
+		if( p == path )
+			return path;
+		*p-- = '\0';
+	}
+	while( p >= path && *p != '/' )
+		p--;
+	return p + 1;
+}
diff --git a/newlib/libc/unix/dirname.c b/newlib/libc/unix/dirname.c
new file mode 100644
index 000000000..f026e3056
--- /dev/null
+++ b/newlib/libc/unix/dirname.c
@@ -0,0 +1,28 @@
+/* Copyright 2005 Shaun Jackman
+ * Permission to use, copy, modify, and distribute this software
+ * is freely granted, provided that this notice is preserved.
+ */
+
+#include <libgen.h>
+#include <string.h>
+
+char *
+_DEFUN (dirname, (path),
+	char *path)
+{
+	char *p;
+	if( path == NULL || *path == '\0' )
+		return ".";
+	p = path + strlen(path) - 1;
+	while( *p == '/' ) {
+		if( p == path )
+			return path;
+		*p-- = '\0';
+	}
+	while( p >= path && *p != '/' )
+		p--;
+	return
+		p < path ? "." :
+		p == path ? "/" :
+		(*p = '\0', path);
+}