X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Ffile-name.c;h=b5cc43deaa2c81b8e5137f5b6a6340c1d7a3acc1;hb=03e8924e2a6b5e6c9dc345ebacc0ea5a9abb4bef;hp=ac3378e300941f1603886ee7c5edf5dbbcead30c;hpb=df2e56765a2dc2cfcd41f4e2fb3bf84ce1be45f1;p=pspp diff --git a/src/data/file-name.c b/src/data/file-name.c index ac3378e300..b5cc43deaa 100644 --- a/src/data/file-name.c +++ b/src/data/file-name.c @@ -82,14 +82,6 @@ fn_search_path (const char *base_name, char **path) return NULL; } -/* Returns the directory part of FILE_NAME, as a malloc()'d - string. */ -char * -fn_dir_name (const char *file_name) -{ - return dir_name (file_name); -} - /* Returns the extension part of FILE_NAME as a malloc()'d string. If FILE_NAME does not have an extension, returns an empty string. */ @@ -122,28 +114,7 @@ fn_exists (const char *name) return ! S_ISDIR (temp.st_mode); } - -/* Environment variables. */ - -/* Simulates $VER and $ARCH environment variables. */ -const char * -fn_getenv (const char *s) -{ - if (!strcmp (s, "VER")) - return fn_getenv_default ("STAT_VER", bare_version); - else if (!strcmp (s, "ARCH")) - return fn_getenv_default ("STAT_ARCH", host_system); - else - return getenv (s); -} -/* Returns getenv(KEY) if that's non-NULL; else returns DEF. */ -const char * -fn_getenv_default (const char *key, const char *def) -{ - const char *value = getenv (key); - return value ? value : def; -} /* Basic file handling. */