From: Bruno Haible Date: Tue, 1 Apr 2003 09:02:02 +0000 (+0000) Subject: New module 'pathname'. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac52880a4604e1b2cd72ae710870e3d463a12d84;p=pspp New module 'pathname'. --- diff --git a/ChangeLog b/ChangeLog index 645f24e87c..6158b488ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-01 Bruno Haible + + * modules/pathname: New file. + * MODULES.html.sh (func_all_modules): Add it. + 2003-03-28 Bruno Haible * modules/copy-file: New file. diff --git a/MODULES.html.sh b/MODULES.html.sh index 0ffbd7645e..290a649a07 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1733,7 +1733,7 @@ func_all_modules () func_module modechange func_module mountlist func_module path-concat - #func_module pathname + func_module pathname func_module pathmax func_module same func_module save-cwd diff --git a/lib/ChangeLog b/lib/ChangeLog index 0cee503f66..0560756f0a 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2003-04-01 Bruno Haible + + * pathname.h: New file, from GNU gettext. + * concatpath.c: New file, from GNU gettext. + 2003-03-30 Bruno Haible * copy-file.c (copy_file_preserving): Don't set owner if the function diff --git a/lib/concatpath.c b/lib/concatpath.c new file mode 100644 index 0000000000..716d2f5d46 --- /dev/null +++ b/lib/concatpath.c @@ -0,0 +1,71 @@ +/* Construct a full pathname from a directory and a filename. + Copyright (C) 2001-2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Written by Bruno Haible . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +/* Specification. */ +#include "pathname.h" + +#include + +#include "xalloc.h" +#include "stpcpy.h" + +/* Concatenate a directory pathname, a relative pathname and an optional + suffix. The directory may end with the directory separator. The second + argument may not start with the directory separator (it is relative). + Return a freshly allocated pathname. */ +char * +concatenated_pathname (const char *directory, const char *filename, + const char *suffix) +{ + char *result; + char *p; + + if (strcmp (directory, ".") == 0) + { + /* No need to prepend the directory. */ + result = (char *) xmalloc (strlen (filename) + + (suffix != NULL ? strlen (suffix) : 0) + + 1); + p = result; + } + else + { + size_t directory_len = strlen (directory); + int need_slash = + (directory_len > FILESYSTEM_PREFIX_LEN (directory) + && !ISSLASH (directory[directory_len - 1])); + result = (char *) xmalloc (directory_len + need_slash + + strlen (filename) + + (suffix != NULL ? strlen (suffix) : 0) + + 1); + memcpy (result, directory, directory_len); + p = result + directory_len; + if (need_slash) + *p++ = '/'; + } + p = stpcpy (p, filename); + if (suffix != NULL) + stpcpy (p, suffix); + return result; +} diff --git a/lib/pathname.h b/lib/pathname.h new file mode 100644 index 0000000000..7b817a4f72 --- /dev/null +++ b/lib/pathname.h @@ -0,0 +1,50 @@ +/* Pathname support. + Copyright (C) 2001-2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _PATHNAME_H +#define _PATHNAME_H + +/* Pathname support. + ISSLASH(C) tests whether C is a directory separator character. + IS_ABSOLUTE_PATH(P) tests whether P is an absolute path. If it is not, + it may be concatenated to a directory pathname. + IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. + */ +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define ISSLASH(C) ((C) == '/' || (C) == '\\') +# define HAS_DEVICE(P) \ + ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ + && (P)[1] == ':') +# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) +# define IS_PATH_WITH_DIR(P) \ + (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) +# define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0) +#else + /* Unix */ +# define ISSLASH(C) ((C) == '/') +# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) +# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) +# define FILESYSTEM_PREFIX_LEN(P) 0 +#endif + +/* Concatenate a directory pathname, a relative pathname and an optional + suffix. Return a freshly allocated pathname. */ +extern char *concatenated_pathname (const char *directory, + const char *filename, const char *suffix); + +#endif /* _PATHNAME_H */ diff --git a/modules/pathname b/modules/pathname new file mode 100644 index 0000000000..82f00d07d7 --- /dev/null +++ b/modules/pathname @@ -0,0 +1,23 @@ +Description: +Construct a full pathname by concatenating a directory name, a relative +filename, and a suffix. + +Files: +lib/pathname.h +lib/concatpath.c + +Depends-on: +xalloc +stpcpy + +configure.ac: + +Makefile.am: +lib_SOURCES += pathname.h concatpath.c + +Include: +"pathname.h" + +Maintainer: +Bruno Haible +