X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Ffile-name.c;h=f8ad11d07a342f22fd5bf4cfa026d9a93a412ce0;hb=e1fb96f07a06f3133f54702ed8706493989789fe;hp=2e8dd76239922edce1d9e2fa49ef6a76df7fecd5;hpb=89cc65d7523e45ec0ecf40da1fe1e4ab5ad8eac8;p=pspp-builds.git
diff --git a/src/data/file-name.c b/src/data/file-name.c
index 2e8dd762..f8ad11d0 100644
--- a/src/data/file-name.c
+++ b/src/data/file-name.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000, 2006, 2007 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 of the
- License, or (at your option) any later version.
+ 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 3 of the License, 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.
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
@@ -22,8 +20,10 @@
#include
#include
+#include
#include
#include
+#include
#include "intprops.h"
#include "minmax.h"
@@ -64,7 +64,7 @@ fn_init (void)
properly handling the case where SRC is a substring of DST.
Variables are as defined by GETENV. Supports $var and ${var}
syntaxes; $$ substitutes as $. */
-void
+void
fn_interp_vars (struct substring src, const char *(*getenv) (const char *),
struct string *dst_)
{
@@ -72,7 +72,7 @@ fn_interp_vars (struct substring src, const char *(*getenv) (const char *),
int c;
while ((c = ss_get_char (&src)) != EOF)
- if (c != '$')
+ if (c != '$')
ds_put_char (&dst, c);
else
{
@@ -89,7 +89,7 @@ fn_interp_vars (struct substring src, const char *(*getenv) (const char *),
else if (ss_match_char (&src, '{'))
ss_get_until (&src, '}', &var_name);
else
- ss_get_chars (&src, MIN (1, ss_span (src, ss_cstr (CC_ALNUM))),
+ ss_get_chars (&src, MAX (1, ss_span (src, ss_cstr (CC_ALNUM))),
&var_name);
start = ds_length (&dst);
@@ -98,7 +98,7 @@ fn_interp_vars (struct substring src, const char *(*getenv) (const char *),
ds_truncate (&dst, start);
ds_put_cstr (&dst, value);
- }
+ }
}
ds_swap (&dst, dst_);
@@ -164,7 +164,7 @@ fn_dir_name (const char *file_name)
If FILE_NAME does not have an extension, returns an empty
string. */
char *
-fn_extension (const char *file_name)
+fn_extension (const char *file_name)
{
const char *extension = strrchr (file_name, '.');
if (extension == NULL)
@@ -254,22 +254,22 @@ safety_violation (const char *fn)
FILE *
fn_open (const char *fn, const char *mode)
{
- assert (mode[0] == 'r' || mode[0] == 'w');
+ assert (mode[0] == 'r' || mode[0] == 'w' || mode[0] == 'a');
- if (mode[0] == 'r' && (!strcmp (fn, "stdin") || !strcmp (fn, "-")))
+ if (mode[0] == 'r' && (!strcmp (fn, "stdin") || !strcmp (fn, "-")))
return stdin;
else if (mode[0] == 'w' && (!strcmp (fn, "stdout") || !strcmp (fn, "-")))
return stdout;
else if (mode[0] == 'w' && !strcmp (fn, "stderr"))
return stderr;
-
+
#if HAVE_POPEN
if (fn[0] == '|')
{
if (get_safer_mode ())
return safety_violation (fn);
- return popen (&fn[1], mode);
+ return popen (&fn[1], mode[0] == 'r' ? "r" : "w");
}
else if (*fn && fn[strlen (fn) - 1] == '|')
{
@@ -278,12 +278,12 @@ fn_open (const char *fn, const char *mode)
if (get_safer_mode ())
return safety_violation (fn);
-
+
s = local_alloc (strlen (fn));
memcpy (s, fn, strlen (fn) - 1);
s[strlen (fn) - 1] = 0;
-
- f = popen (s, mode);
+
+ f = popen (s, mode[0] == 'r' ? "r" : "w");
local_free (s);
@@ -307,7 +307,9 @@ fn_open (const char *fn, const char *mode)
int
fn_close (const char *fn, FILE *f)
{
- if (!strcmp (fn, "-"))
+ if (fileno (f) == STDIN_FILENO
+ || fileno (f) == STDOUT_FILENO
+ || fileno (f) == STDERR_FILENO)
return 0;
#if HAVE_POPEN
else if (fn[0] == '|' || (*fn && fn[strlen (fn) - 1] == '|'))
@@ -320,9 +322,33 @@ fn_close (const char *fn, FILE *f)
return fclose (f);
}
+/* Creates a new file named FN with the given PERMISSIONS bits,
+ and returns a stream for it or a null pointer on failure.
+ MODE should be "w" or "wb". */
+FILE *
+create_stream (const char *fn, const char *mode, mode_t permissions)
+{
+ int fd;
+ FILE *stream;
+
+ fd = open (fn, O_WRONLY | O_CREAT | O_TRUNC, permissions);
+ if (fd < 0)
+ return NULL;
+
+ stream = fdopen (fd, mode);
+ if (stream == NULL)
+ {
+ int save_errno = errno;
+ close (fd);
+ errno = save_errno;
+ }
+
+ return stream;
+}
+
#if !(defined _WIN32 || defined __WIN32__)
/* A file's identity. */
-struct file_identity
+struct file_identity
{
dev_t device; /* Device number. */
ino_t inode; /* Inode number. */
@@ -333,13 +359,13 @@ struct file_identity
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. */
+ fn_free_identity() when finished. */
struct file_identity *
-fn_get_identity (const char *file_name)
+fn_get_identity (const char *file_name)
{
struct stat s;
- if (stat (file_name, &s) == 0)
+ if (stat (file_name, &s) == 0)
{
struct file_identity *identity = xmalloc (sizeof *identity);
identity->device = s.st_dev;
@@ -352,7 +378,7 @@ fn_get_identity (const char *file_name)
/* Frees IDENTITY obtained from fn_get_identity(). */
void
-fn_free_identity (struct file_identity *identity)
+fn_free_identity (struct file_identity *identity)
{
free (identity);
}
@@ -360,7 +386,7 @@ fn_free_identity (struct file_identity *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)
+ const struct file_identity *b)
{
assert (a != NULL);
assert (b != NULL);
@@ -371,7 +397,7 @@ fn_compare_file_identities (const struct file_identity *a,
}
#else /* Windows */
/* A file's identity. */
-struct file_identity
+struct file_identity
{
char *normalized_file_name; /* File's normalized name. */
};
@@ -381,9 +407,9 @@ struct file_identity
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. */
+ fn_free_identity() when finished. */
struct file_identity *
-fn_get_identity (const char *file_name)
+fn_get_identity (const char *file_name)
{
struct file_identity *identity = xmalloc (sizeof *identity);
char cname[PATH_MAX];
@@ -398,9 +424,9 @@ fn_get_identity (const char *file_name)
/* Frees IDENTITY obtained from fn_get_identity(). */
void
-fn_free_identity (struct file_identity *identity)
+fn_free_identity (struct file_identity *identity)
{
- if (identity != NULL)
+ if (identity != NULL)
{
free (identity->normalized_file_name);
free (identity);
@@ -410,7 +436,7 @@ fn_free_identity (struct file_identity *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)
+ const struct file_identity *b)
{
return strcasecmp (a->normalized_file_name, b->normalized_file_name);
}