[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src data/ChangeLog data/filename.c data/fi...
|
From: |
Ben Pfaff |
|
Subject: |
[Pspp-cvs] pspp/src data/ChangeLog data/filename.c data/fi... |
|
Date: |
Sun, 16 Apr 2006 23:43:48 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Branch:
Changes by: Ben Pfaff <address@hidden> 06/04/16 23:43:48
Modified files:
src/data : ChangeLog filename.c filename.h
src/language : line-buffer.c
src/output : postscript.c
Log message:
Renamed some file name functions.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/ChangeLog.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/filename.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/filename.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/line-buffer.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/output/postscript.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
Patches:
Index: pspp/src/data/ChangeLog
diff -u pspp/src/data/ChangeLog:1.15 pspp/src/data/ChangeLog:1.16
--- pspp/src/data/ChangeLog:1.15 Sun Apr 16 23:35:19 2006
+++ pspp/src/data/ChangeLog Sun Apr 16 23:43:48 2006
@@ -1,3 +1,12 @@
+Sun Apr 16 16:42:47 2006 Ben Pfaff <address@hidden>
+
+ * filename.c: (fn_dirname) Renamed fn_dir_name(), all references
+ updated.
+ (fn_basename) Removed (dead code).
+ (fn_absolute_p) Renamed fn_is_absolute(), all references updated.
+ (fn_special_p) Renamed fn_is_special(), all references updated.
+ (fn_exists_p) Renamed fn_exists(), all references updated.
+
Sun Apr 16 16:33:58 2006 Ben Pfaff <address@hidden>
* filename.c: (fn_tilde_expand) Rewrite for cleaner code.
Index: pspp/src/data/filename.c
diff -u pspp/src/data/filename.c:1.10 pspp/src/data/filename.c:1.11
--- pspp/src/data/filename.c:1.10 Sun Apr 16 23:35:20 2006
+++ pspp/src/data/filename.c Sun Apr 16 23:43:48 2006
@@ -221,7 +221,7 @@
struct string file = DS_INITIALIZER;
size_t save_idx = 0;
- if (fn_absolute_p (base_name))
+ if (fn_is_absolute (base_name))
return fn_tilde_expand (base_name);
/* Interpolate environment variables. */
@@ -242,7 +242,7 @@
/* Construct file name. */
ds_clear (&file);
- if (prefix != NULL && !fn_absolute_p (ds_c_str (&dir)))
+ if (prefix != NULL && !fn_is_absolute (ds_c_str (&dir)))
{
ds_puts (&file, prefix);
ds_putc (&file, DIR_SEPARATOR);
@@ -253,7 +253,7 @@
ds_puts (&file, base_name);
/* Check whether file exists. */
- if (fn_exists_p (ds_c_str (&file)))
+ if (fn_exists (ds_c_str (&file)))
{
verbose_msg (2, _("...found \"%s\""), ds_c_str (&file));
ds_destroy (&path);
@@ -283,7 +283,7 @@
char *fn1, *fn2, *dest;
int maxlen;
- if (fn_special_p (filename))
+ if (fn_is_special (filename))
return xstrdup (filename);
fn1 = fn_tilde_expand (filename);
@@ -450,7 +450,7 @@
/* Returns the directory part of FILENAME, as a malloc()'d
string. */
char *
-fn_dirname (const char *filename)
+fn_dir_name (const char *filename)
{
const char *p;
char *s;
@@ -473,16 +473,6 @@
return s;
}
-/* Returns the basename part of FILENAME as a malloc()'d string. */
-#if 0
-char *
-fn_basename (const char *filename)
-{
- /* Not used, not implemented. */
- abort ();
-}
-#endif
-
/* Returns the extension part of FILENAME as a malloc()'d string.
If FILENAME does not have an extension, returns an empty
string. */
@@ -536,7 +526,7 @@
/* Returns nonzero iff NAME specifies an absolute filename. */
int
-fn_absolute_p (const char *name)
+fn_is_absolute (const char *name)
{
#ifdef unix
if (name[0] == '/'
@@ -558,7 +548,7 @@
/* Returns 1 if the filename specified is a virtual file that doesn't
really exist on disk, 0 if it's a real filename. */
int
-fn_special_p (const char *filename)
+fn_is_special (const char *filename)
{
if (!strcmp (filename, "-") || !strcmp (filename, "stdin")
|| !strcmp (filename, "stdout") || !strcmp (filename, "stderr")
@@ -574,7 +564,7 @@
/* Returns nonzero if file with name NAME exists. */
int
-fn_exists_p (const char *name)
+fn_exists (const char *name)
{
#ifdef unix
struct stat temp;
Index: pspp/src/data/filename.h
diff -u pspp/src/data/filename.h:1.4 pspp/src/data/filename.h:1.5
--- pspp/src/data/filename.h:1.4 Sun Apr 16 23:08:02 2006
+++ pspp/src/data/filename.h Sun Apr 16 23:43:48 2006
@@ -42,20 +42,19 @@
struct string;
void fn_interp_vars (struct string *target,
- const char *(*getenv) (const char *));
+ const char *(*getenv) (const char *));
char *fn_tilde_expand (const char *fn);
char *fn_search_path (const char *base_name, const char *path,
const char *prefix);
char *fn_normalize (const char *fn);
-char *fn_dirname (const char *fn);
-char *fn_basename (const char *fn);
+char *fn_dir_name (const char *fn);
char *fn_extension (const char *fn);
char *fn_get_cwd (void);
-int fn_absolute_p (const char *fn);
-int fn_special_p (const char *fn);
-int fn_exists_p (const char *fn);
+int fn_is_absolute (const char *fn);
+int fn_is_special (const char *fn);
+int fn_exists (const char *fn);
char *fn_readlink (const char *fn);
const char *fn_getenv (const char *variable);
Index: pspp/src/language/line-buffer.c
diff -u pspp/src/language/line-buffer.c:1.4 pspp/src/language/line-buffer.c:1.5
--- pspp/src/language/line-buffer.c:1.4 Sun Apr 16 23:08:02 2006
+++ pspp/src/language/line-buffer.c Sun Apr 16 23:43:48 2006
@@ -236,7 +236,7 @@
if (cur_source != NULL)
{
char *found_fn = fn_search_path (fn, ds_c_str (&getl_include_path),
- fn_dirname (cur_source->fn));
+ fn_dir_name (cur_source->fn));
if (found_fn != NULL)
{
include_source (create_syntax_file_source (found_fn));
Index: pspp/src/output/postscript.c
diff -u pspp/src/output/postscript.c:1.10 pspp/src/output/postscript.c:1.11
--- pspp/src/output/postscript.c:1.10 Sun Apr 16 18:55:09 2006
+++ pspp/src/output/postscript.c Sun Apr 16 23:43:48 2006
@@ -429,7 +429,7 @@
static char *
find_ps_file (const char *name)
{
- if (fn_absolute_p (name))
+ if (fn_is_absolute (name))
return xstrdup (name);
else
{