From d4ba2f9001cc9ecc44d1afcacf5cc044e4233933 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 24 Sep 2007 16:57:12 +0200 Subject: [PATCH] move dirname() and basename() to lib/libgen.c and add header file --- include/libgen.h | 8 ++++++++ lib/libgen.c | 26 ++++++++++++++++++++++++++ net/nfs.c | 28 +--------------------------- 3 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 include/libgen.h create mode 100644 lib/libgen.c diff --git a/include/libgen.h b/include/libgen.h new file mode 100644 index 000000000..cd27fd11e --- /dev/null +++ b/include/libgen.h @@ -0,0 +1,8 @@ +#ifndef __LIBGEN_H +#define __LIBGEN_H + +char *basename (char *path); +char *dirname (char *path); + +#endif /* __LIBGEN_H */ + diff --git a/lib/libgen.c b/lib/libgen.c new file mode 100644 index 000000000..97a1f104a --- /dev/null +++ b/lib/libgen.c @@ -0,0 +1,26 @@ + +char *basename (char *path) +{ + char *fname; + + fname = path + strlen(path) - 1; + while (fname >= path) { + if (*fname == '/') { + fname++; + break; + } + fname--; + } + return fname; +} + +char *dirname (char *path) +{ + char *fname; + + fname = basename (path); + --fname; + *fname = '\0'; + return path; +} + diff --git a/net/nfs.c b/net/nfs.c index 4e3d16e63..d0d11ccec 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "nfs.h" #include "bootp.h" @@ -75,33 +76,6 @@ store_block (uchar * src, unsigned offset, unsigned len) return 0; } -static char* -basename (char *path) -{ - char *fname; - - fname = path + strlen(path) - 1; - while (fname >= path) { - if (*fname == '/') { - fname++; - break; - } - fname--; - } - return fname; -} - -static char* -dirname (char *path) -{ - char *fname; - - fname = basename (path); - --fname; - *fname = '\0'; - return path; -} - /************************************************************************** RPC_ADD_CREDENTIALS - Add RPC authentication/verifier entries **************************************************************************/