X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Ffile-name.c;h=184a79aa4f79ae1b7e1c40de95a414e0922655da;hb=refs%2Fheads%2Fctables7;hp=dfdfa6d223c89c3821cee5002e3370364f5edb2d;hpb=c59aaac4ae90d783e96de486208b245f4f31691f;p=pspp diff --git a/src/data/file-name.c b/src/data/file-name.c index dfdfa6d223..184a79aa4f 100644 --- a/src/data/file-name.c +++ b/src/data/file-name.c @@ -17,6 +17,7 @@ #include #include "data/file-name.h" +#include "data/file-handle-def.h" #include #include @@ -24,16 +25,17 @@ #include #include #include + #include #include "data/settings.h" #include "libpspp/hash-functions.h" #include "libpspp/message.h" +#include "libpspp/i18n.h" #include "libpspp/str.h" #include "libpspp/version.h" #include "gl/dirname.h" -#include "gl/dosname.h" #include "gl/intprops.h" #include "gl/minmax.h" #include "gl/relocatable.h" @@ -43,14 +45,35 @@ #include "gettext.h" #define _(msgid) gettext (msgid) -#if defined _WIN32 || defined __WIN32__ -#define WIN32_LEAN_AND_MEAN /* avoid including junk */ -#include -#endif /* Functions for performing operations on file names. */ -/* Searches for a configuration file with name NAME in the directories given in + +/* Returns the extension part of FILE_NAME as a malloc()'d string. + If FILE_NAME does not have an extension, returns an empty + string. */ +char * +fn_extension (const struct file_handle *fh) +{ + const char *file_name = fh_get_file_name (fh); + + const char *extension = strrchr (file_name, '.'); + if (extension == NULL) + extension = ""; + return xstrdup (extension); +} + +/* Find out information about files. */ + +/* Returns true iff NAME specifies an absolute file name. */ +static bool +fn_is_absolute (const char *name) +{ + return IS_ABSOLUTE_FILE_NAME (name); +} + + +/* Searches for a file with name NAME in the directories given in PATH, which is terminated by a null pointer. Returns the full name of the first file found, which the caller is responsible for freeing with free(), or NULL if none is found. */ @@ -74,42 +97,25 @@ fn_search_path (const char *base_name, char **path) else file = xasprintf ("%s/%s", dir, base_name); - if (fn_exists (file)) - return file; + struct stat temp; + if (((stat (file, &temp) == 0) && (! S_ISDIR (temp.st_mode)))) + return file; + free (file); } return NULL; } -/* Returns the extension part of FILE_NAME as a malloc()'d string. - If FILE_NAME does not have an extension, returns an empty - string. */ -char * -fn_extension (const char *file_name) -{ - const char *extension = strrchr (file_name, '.'); - if (extension == NULL) - extension = ""; - return xstrdup (extension); -} - -/* Find out information about files. */ - -/* Returns true iff NAME specifies an absolute file name. */ -bool -fn_is_absolute (const char *name) -{ - return IS_ABSOLUTE_FILE_NAME (name); -} /* Returns true if file with name NAME exists, and that file is not a directory */ bool -fn_exists (const char *name) +fn_exists (const struct file_handle *fh) { + const char *name = fh_get_file_name (fh); struct stat temp; - if ( stat (name, &temp) != 0 ) + if (stat (name, &temp) != 0) return false; return ! S_ISDIR (temp.st_mode); @@ -135,8 +141,10 @@ safety_violation (const char *fn) NULL on failure. If NULL is returned then errno is set to a sensible value. */ FILE * -fn_open (const char *fn, const char *mode) +fn_open (const struct file_handle *fh, const char *mode) { + const char *fn = fh_get_file_name (fh); + assert (mode[0] == 'r' || mode[0] == 'w' || mode[0] == 'a'); if (mode[0] == 'r') @@ -180,15 +188,28 @@ fn_open (const char *fn, const char *mode) } else #endif + +#if WIN32 + { + wchar_t *ss = convert_to_filename_encoding (fn, strlen (fn), fh_get_file_name_encoding (fh)); + wchar_t *m = (wchar_t *) recode_string ("UTF-16LE", "ASCII", mode, strlen (mode)); + FILE *fp = _wfopen (ss, m); + free (m); + free (ss); + return fp; + } +#else return fopen (fn, mode); +#endif } /* Counterpart to fn_open that closes file F with name FN; returns 0 on success, EOF on failure. If EOF is returned, errno is set to a sensible value. */ int -fn_close (const char *fn, FILE *f) +fn_close (const struct file_handle *fh, FILE *f) { + const char *fn = fh_get_file_name (fh); if (fileno (f) == STDIN_FILENO || fileno (f) == STDOUT_FILENO || fileno (f) == STDERR_FILENO) @@ -205,138 +226,6 @@ fn_close (const char *fn, FILE *f) } -/* A file's identity: - - - For a file that exists, this is its device and inode. - - - For a file that does not exist, but which has a directory - name that exists, this is the device and inode of the - directory, plus the file's base name. - - - For a file that does not exist and has a nonexistent - directory, this is the file name. - - Windows doesn't have inode numbers, so we just use the name - there. */ -struct file_identity -{ - dev_t device; /* Device number. */ - ino_t inode; /* Inode number. */ - char *name; /* File name, where needed, otherwise NULL. */ -}; - -/* Returns a pointer to a dynamically allocated structure whose - value can be used to tell whether two files are actually the - same file. Returns a null pointer if no information about the - file is available, perhaps because it does not exist. The - caller is responsible for freeing the structure with - fn_free_identity() when finished. */ -struct file_identity * -fn_get_identity (const char *file_name) -{ - struct file_identity *identity = xmalloc (sizeof *identity); - -#if !(defined _WIN32 || defined __WIN32__) - struct stat s; - if (lstat (file_name, &s) == 0) - { - identity->device = s.st_dev; - identity->inode = s.st_ino; - identity->name = NULL; - } - else - { - char *dir = dir_name (file_name); - if (last_component (file_name) != NULL && stat (dir, &s) == 0) - { - identity->device = s.st_dev; - identity->inode = s.st_ino; - identity->name = base_name (file_name); - } - else - { - identity->device = 0; - identity->inode = 0; - identity->name = xstrdup (file_name); - } - free (dir); - } -#else /* Windows */ - bool ok = false; - HANDLE h = CreateFile (file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); - if (h != INVALID_HANDLE_VALUE) - { - BY_HANDLE_FILE_INFORMATION fi; - ok = GetFileInformationByHandle (h, &fi); - if (ok) - { - identity->device = fi.dwVolumeSerialNumber; - identity->inode = fi.nFileIndexHigh << 16 | fi.nFileIndexLow; - identity->name = 0; - } - CloseHandle (h); - } - - if (!ok) - { - identity->device = 0; - identity->inode = 0; - - size_t bufsize; - size_t pathlen = 255; - char *cname = NULL; - do - { - bufsize = pathlen; - cname = xrealloc (cname, bufsize); - pathlen = GetFullPathName (file_name, bufsize, cname, NULL); - } - while (pathlen > bufsize); - identity->name = xstrdup (cname); - free (cname); - str_lowercase (identity->name); - } -#endif /* Windows */ - - return identity; -} - -/* Frees IDENTITY obtained from fn_get_identity(). */ -void -fn_free_identity (struct file_identity *identity) -{ - if (identity != NULL) - { - free (identity->name); - free (identity); - } -} - -/* Compares A and B, returning a strcmp()-type result. */ -int -fn_compare_file_identities (const struct file_identity *a, - const struct file_identity *b) -{ - if (a->device != b->device) - return a->device < b->device ? -1 : 1; - else if (a->inode != b->inode) - return a->inode < b->inode ? -1 : 1; - else if (a->name != NULL) - return b->name != NULL ? strcmp (a->name, b->name) : 1; - else - return b->name != NULL ? -1 : 0; -} - -/* Returns a hash value for IDENTITY. */ -unsigned int -fn_hash_identity (const struct file_identity *identity) -{ - unsigned int hash = hash_int (identity->device, identity->inode); - if (identity->name != NULL) - hash = hash_string (identity->name, hash); - return hash; -} - #ifdef WIN32 /* Apparently windoze users like to see output dumped into their home directory, @@ -346,11 +235,10 @@ default_output_path (void) { static char *path = NULL; - if ( path == NULL) + if (path == NULL) { /* Windows NT defines HOMEDRIVE and HOMEPATH. But give preference to HOME, because the user can change HOME. */ - const char *home_dir = getenv ("HOME"); int i;