X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Ffile-name.c;h=acf27c3ce882e67a7e549354d026d547c602fa31;hb=44326932c8227c64a87f7a92ef16ce83c2fba2d4;hp=f937592636c1cf45453820f3b18ef60f4058aae8;hpb=d8749acaf878dccf9e4527c27d06d06eb5e03091;p=pspp-builds.git diff --git a/src/data/file-name.c b/src/data/file-name.c index f9375926..acf27c3c 100644 --- a/src/data/file-name.c +++ b/src/data/file-name.c @@ -25,10 +25,10 @@ #include #include +#include "canonicalize.h" #include "intprops.h" #include "minmax.h" #include "settings.h" -#include "xreadlink.h" #include #include @@ -40,25 +40,8 @@ #include "gettext.h" #define _(msgid) gettext (msgid) -/* PORTME: Everything in this file is system dependent. */ - -#ifdef unix -#include #include #include -#include "stat-macros.h" -#endif - -#ifdef __WIN32__ -#define NOGDI -#define NOUSER -#define NONLS -#include -#endif - -#if __DJGPP__ -#include -#endif /* Initialization. */ @@ -118,60 +101,8 @@ fn_interp_vars (struct substring src, const char *(*getenv) (const char *), ds_destroy (&dst); } -#ifdef unix -/* Expands csh tilde notation from the path INPUT into a malloc()'d - returned string. */ -char * -fn_tilde_expand (const char *input) -{ - struct string output = DS_EMPTY_INITIALIZER; - if (input[0] == '~') - { - const char *home = NULL; - const char *remainder = NULL; - if (input[1] == '/' || input[1] == '\0') - { - home = fn_getenv ("HOME"); - remainder = input + 1; - } - else - { - struct string user_name = DS_EMPTY_INITIALIZER; - struct passwd *pwd; - - ds_assign_substring (&user_name, - ss_buffer (input + 1, - strcspn (input + 1, "/"))); - pwd = getpwnam (ds_cstr (&user_name)); - if (pwd != NULL && pwd->pw_dir[0] != '\0') - { - home = xstrdup (pwd->pw_dir); - remainder = input + 1 + ds_length (&user_name); - } - ds_destroy (&user_name); - } - - if (home != NULL) - { - ds_put_cstr (&output, home); - if (*remainder != '\0') - ds_put_cstr (&output, remainder); - } - } - if (ds_is_empty (&output)) - ds_put_cstr (&output, input); - return ds_cstr (&output); -} -#else /* !unix */ -char * -fn_tilde_expand (const char *input) -{ - return xstrdup (input); -} -#endif /* !unix */ - /* Searches for a configuration file with name NAME in the path - given by PATH, which is tilde- and environment-interpolated. + given by PATH, which is environment-interpolated. Directories in PATH are delimited by ':'. Returns the malloc'd full name of the first file found, or NULL if none is found. */ @@ -179,12 +110,12 @@ char * fn_search_path (const char *base_name, const char *path_) { struct string path; - struct substring dir_; + struct substring dir; struct string file = DS_EMPTY_INITIALIZER; size_t save_idx = 0; if (fn_is_absolute (base_name)) - return fn_tilde_expand (base_name); + return xstrdup (base_name); /* Interpolate environment variables. */ ds_init_cstr (&path, path_); @@ -192,26 +123,14 @@ fn_search_path (const char *base_name, const char *path_) verbose_msg (2, _("searching for \"%s\" in path \"%s\""), base_name, ds_cstr (&path)); - while (ds_separate (&path, ss_cstr (":"), &save_idx, &dir_)) + while (ds_separate (&path, ss_cstr (":"), &save_idx, &dir)) { - struct string dir; - - /* Do tilde expansion. */ - ds_init_substring (&dir, dir_); - if (ds_first (&dir) == '~') - { - char *tmp_str = fn_tilde_expand (ds_cstr (&dir)); - ds_assign_cstr (&dir, tmp_str); - free (tmp_str); - } - /* Construct file name. */ ds_clear (&file); - ds_put_cstr (&file, ds_cstr (&dir)); + ds_put_substring (&file, dir); if (!ds_is_empty (&file) && ds_last (&file) != '/') ds_put_char (&file, '/'); ds_put_cstr (&file, base_name); - ds_destroy (&dir); /* Check whether file exists. */ if (fn_exists (ds_cstr (&file))) @@ -229,183 +148,6 @@ fn_search_path (const char *base_name, const char *path_) return NULL; } -/* fn_normalize(): This very OS-dependent routine canonicalizes - file name FN1. The file name should not need to be the name of an - existing file. Returns a malloc()'d copy of the canonical name. - This function must always succeed; if it needs to bail out then it - should return xstrdup(FN1). */ -#ifdef unix -char * -fn_normalize (const char *file_name) -{ - const char *src; - char *fn1, *fn2, *dest; - int maxlen; - - if (fn_is_special (file_name)) - return xstrdup (file_name); - - fn1 = fn_tilde_expand (file_name); - - /* Follow symbolic links. */ - for (;;) - { - fn2 = fn1; - fn1 = fn_readlink (fn1); - if (!fn1) - { - fn1 = fn2; - break; - } - free (fn2); - } - - maxlen = strlen (fn1) * 2; - if (maxlen < 31) - maxlen = 31; - dest = fn2 = xmalloc (maxlen + 1); - src = fn1; - - if (*src == '/') - *dest++ = *src++; - else - { - errno = 0; - while (getcwd (dest, maxlen - (dest - fn2)) == NULL && errno == ERANGE) - { - maxlen *= 2; - dest = fn2 = xrealloc (fn2, maxlen + 1); - errno = 0; - } - if (errno) - { - free (fn1); - free (fn2); - return NULL; - } - dest = strchr (fn2, '\0'); - if (dest - fn2 >= maxlen) - { - int ofs = dest - fn2; - maxlen *= 2; - fn2 = xrealloc (fn2, maxlen + 1); - dest = fn2 + ofs; - } - if (dest[-1] != '/') - *dest++ = '/'; - } - - for (;;) - { - int c, f; - - c = *src++; - - f = 0; - if (c == '/' || c == 0) - { - /* remove `./', `../' from directory */ - if (dest[-1] == '.' && dest[-2] == '/') - dest--; - else if (dest[-1] == '.' && dest[-2] == '.' && dest[-3] == '/') - { - dest -= 3; - if (dest == fn2) - dest++; - while (dest[-1] != '/') - dest--; - } - else if (dest[-1] != '/') /* remove extra slashes */ - f = 1; - - if (c == 0) - { - if (dest[-1] == '/' && dest > fn2 + 1) - dest--; - *dest = 0; - free (fn1); - - return xrealloc (fn2, strlen (fn2) + 1); - } - } - else - f = 1; - - if (f) - { - if (dest - fn2 >= maxlen) - { - int ofs = dest - fn2; - maxlen *= 2; - fn2 = xrealloc (fn2, maxlen + 1); - dest = fn2 + ofs; - } - *dest++ = c; - } - } -} -#elif defined (__WIN32__) -char * -fn_normalize (const char *fn1) -{ - DWORD len; - DWORD success; - char *fn2; - - /* Don't change special file names. */ - if (fn_is_special (file_name)) - return xstrdup (file_name); - - /* First find the required buffer length. */ - len = GetFullPathName (fn1, 0, NULL, NULL); - if (!len) - { - fn2 = xstrdup (fn1); - return fn2; - } - - /* Then make a buffer that big. */ - fn2 = xmalloc (len); - success = GetFullPathName (fn1, len, fn2, NULL); - if (success >= len || success == 0) - { - free (fn2); - fn2 = xstrdup (fn1); - return fn2; - } - return fn2; -} -#elif __BORLANDC__ -char * -fn_normalize (const char *fn1) -{ - char *fn2 = _fullpath (NULL, fn1, 0); - if (fn2) - { - char *cp; - for (cp = fn2; *cp; cp++) - *cp = toupper ((unsigned char) (*cp)); - return fn2; - } - return xstrdup (fn1); -} -#elif __DJGPP__ -char * -fn_normalize (const char *fn1) -{ - char *fn2 = xmalloc (1024); - _fixpath (fn1, fn2); - fn2 = xrealloc (fn2, strlen (fn2) + 1); - return fn2; -} -#else /* not Lose32, Unix, or DJGPP */ -char * -fn_normalize (const char *fn) -{ - return xstrdup (fn); -} -#endif /* not Lose32, Unix, or DJGPP */ - /* Returns the directory part of FILE_NAME, as a malloc()'d string. */ char * @@ -444,66 +186,15 @@ fn_extension (const char *file_name) return xstrdup (extension); } -#if unix -/* Returns the current working directory, as a malloc()'d string. - From libc.info. */ -char * -fn_get_cwd (void) -{ - int size = 100; - char *buffer = xmalloc (size); - - for (;;) - { - char *value = getcwd (buffer, size); - if (value != 0) - return buffer; - - size *= 2; - free (buffer); - buffer = xmalloc (size); - } -} -#else -char * -fn_get_cwd (void) -{ - int size = 2; - char *buffer = xmalloc (size); - if ( buffer) - { - buffer[0]='.'; - buffer[1]='\0'; - } - - return buffer; - -} -#endif - /* Find out information about files. */ /* Returns true iff NAME specifies an absolute file name. */ bool fn_is_absolute (const char *name) { -#ifdef unix - if (name[0] == '/' - || !strncmp (name, "./", 2) - || !strncmp (name, "../", 3) - || name[0] == '~') - return true; -#elif defined (__MSDOS__) - if (name[0] == '\\' - || !strncmp (name, ".\\", 2) - || !strncmp (name, "..\\", 3) - || (name[0] && name[1] == ':')) - return true; -#endif - - return false; + return name[0] == '/'; } - + /* Returns true if FILE_NAME is a virtual file that doesn't really exist on disk, false if it's a real file name. */ bool @@ -511,7 +202,7 @@ fn_is_special (const char *file_name) { if (!strcmp (file_name, "-") || !strcmp (file_name, "stdin") || !strcmp (file_name, "stdout") || !strcmp (file_name, "stderr") -#ifdef unix +#ifdef HAVE_POPEN || file_name[0] == '|' || (*file_name && file_name[strlen (file_name) - 1] == '|') #endif @@ -525,25 +216,8 @@ fn_is_special (const char *file_name) bool fn_exists (const char *name) { -#ifdef unix struct stat temp; - return stat (name, &temp) == 0; -#else - FILE *f = fopen (name, "r"); - if (!f) - return false; - fclose (f); - return true; -#endif -} - -/* Returns the symbolic link value for FILE_NAME as a dynamically - allocated buffer, or a null pointer on failure. */ -char * -fn_readlink (const char *file_name) -{ - return xreadlink (file_name, 32); } /* Environment variables. */ @@ -570,6 +244,7 @@ fn_getenv_default (const char *key, const char *def) /* Basic file handling. */ +#if HAVE_POPEN /* Used for giving an error message on a set_safer security violation. */ static FILE * @@ -579,6 +254,7 @@ safety_violation (const char *fn) errno = EPERM; return NULL; } +#endif /* As a general comment on the following routines, a `sensible value' for errno includes 0 if there is no associated system error. The @@ -601,7 +277,7 @@ fn_open (const char *fn, const char *mode) else if (mode[0] == 'w' && !strcmp (fn, "stderr")) return stderr; -#ifdef unix +#if HAVE_POPEN if (fn[0] == '|') { if (get_safer_mode ()) @@ -647,7 +323,7 @@ fn_close (const char *fn, FILE *f) { if (!strcmp (fn, "-")) return 0; -#ifdef unix +#if HAVE_POPEN else if (fn[0] == '|' || (*fn && fn[strlen (fn) - 1] == '|')) { pclose (f); @@ -724,7 +400,10 @@ struct file_identity * fn_get_identity (const char *file_name) { struct file_identity *identity = xmalloc (sizeof *identity); - identity->normalized_file_name = fn_normalize (file_name); + char *cname = canonicalize_filename_mode (file_name, CAN_MISSING); + if (cname == NULL) + cname = xstrdup (file_name); + identity->normalized_file_name = cname; return identity; }