X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fpermissions.c;h=771eb72832dd1de27304976879eb931cb29350e5;hb=3b54533821614d17afc61f1cd3b87d3a06fbf4da;hp=fec6b4fc3034ca882d66394b94c6d615ae4c369a;hpb=9b94efd7513afdb12a6023024e00e50801532fee;p=pspp
diff --git a/src/language/utilities/permissions.c b/src/language/utilities/permissions.c
index fec6b4fc30..771eb72832 100644
--- a/src/language/utilities/permissions.c
+++ b/src/language/utilities/permissions.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2010, 2011 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
@@ -15,18 +15,21 @@
along with this program. If not, see . */
#include
-#include
+
+#include
#include
-#include
#include
+#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+
+#include "data/settings.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/cast.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -40,41 +43,44 @@ int change_permissions(const char *file_name, enum PER per);
int
cmd_permissions (struct lexer *lexer, struct dataset *ds UNUSED)
{
- char *fn = 0;
-
- lex_match (lexer, '/');
+ char *fn = NULL;
+ const char *str = NULL;
+ lex_match (lexer, T_SLASH);
if (lex_match_id (lexer, "FILE"))
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
- fn = ds_xstrdup (lex_tokstr (lexer));
- lex_force_match (lexer, T_STRING);
+ str = lex_tokcstr (lexer);
+ if (str)
+ fn = strdup (str);
+ if (!lex_force_match (lexer, T_STRING) || str == NULL)
+ goto error;
- lex_match (lexer, '/');
+ lex_match (lexer, T_SLASH);
- if ( ! lex_match_id (lexer, "PERMISSIONS"))
+ if (! lex_match_id (lexer, "PERMISSIONS"))
goto error;
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
- if ( lex_match_id (lexer, "READONLY"))
+ if (lex_match_id (lexer, "READONLY"))
{
- if ( ! change_permissions(fn, PER_RO ) )
+ if (! change_permissions (fn, PER_RO))
goto error;
}
- else if ( lex_match_id (lexer, "WRITEABLE"))
+ else if (lex_match_id (lexer, "WRITEABLE"))
{
- if ( ! change_permissions(fn, PER_RW ) )
+ if (! change_permissions (fn, PER_RW))
goto error;
}
else
{
- msg (SE, _("Expecting %s or %s."), "WRITEABLE", "READONLY");
+ lex_error_expecting (lexer, "WRITEABLE", "READONLY");
goto error;
}
- free(fn);
+ free (fn);
return CMD_SUCCESS;
@@ -90,35 +96,40 @@ cmd_permissions (struct lexer *lexer, struct dataset *ds UNUSED)
int
change_permissions (const char *file_name, enum PER per)
{
+ char *locale_file_name;
struct stat buf;
mode_t mode;
if (settings_get_safer_mode ())
{
- msg (SE, _("This command not allowed when the SAFER option is set."));
- return CMD_FAILURE;
+ msg (SE, _("This command not allowed when the %s option is set."), "SAFER");
+ return 0;
}
-
- if ( -1 == stat(file_name, &buf) )
+ locale_file_name = utf8_to_filename (file_name);
+ if (-1 == stat(locale_file_name, &buf))
{
const int errnum = errno;
msg (SE, _("Cannot stat %s: %s"), file_name, strerror(errnum));
+ free (locale_file_name);
return 0;
}
- if ( per == PER_RW )
- mode = buf.st_mode | S_IWUSR ;
+ if (per == PER_RW)
+ mode = buf.st_mode | 0200;
else
- mode = buf.st_mode & ~( S_IWOTH | S_IWUSR | S_IWGRP );
+ mode = buf.st_mode & ~0222;
- if ( -1 == chmod(file_name, mode))
+ if (-1 == chmod(locale_file_name, mode))
{
const int errnum = errno;
msg (SE, _("Cannot change mode of %s: %s"), file_name, strerror(errnum));
+ free (locale_file_name);
return 0;
}
+ free (locale_file_name);
+
return 1;
}