X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Futilities%2Fpermissions.c;h=2ea91de1dcbac0ed27ce267fade61e32b8b6c983;hb=45e451f87ff06ec753ed9e860f2b1dd953ce5eed;hp=b0a8e27c4b71dbe14a79f0054ddf777bd93950be;hpb=3f2ed1c5fe6dc692ca00bb18a15e41617fa2d37d;p=pspp
diff --git a/src/language/utilities/permissions.c b/src/language/utilities/permissions.c
index b0a8e27c4b..2ea91de1dc 100644
--- a/src/language/utilities/permissions.c
+++ b/src/language/utilities/permissions.c
@@ -1,36 +1,35 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2004 Free Software Foundation, Inc.
- Author: John Darrington
+/* PSPP - a program for statistical analysis.
+ 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 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
-#include
+
+#include
#include
-#include
#include
+#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include "stat-macros.h"
-#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)
@@ -42,39 +41,42 @@ int change_permissions(const char *file_name, enum PER per);
/* Parses the PERMISSIONS command. */
int
-cmd_permissions (void)
+cmd_permissions (struct lexer *lexer, struct dataset *ds UNUSED)
{
char *fn = 0;
- lex_match ('/');
+ lex_match (lexer, T_SLASH);
+
+ if (lex_match_id (lexer, "FILE"))
+ lex_match (lexer, T_EQUALS);
+
+ if (!lex_force_string (lexer))
+ return CMD_FAILURE;
- if (lex_match_id ("FILE"))
- lex_match ('=');
+ fn = ss_xstrdup (lex_tokss (lexer));
+ lex_force_match (lexer, T_STRING);
- fn = strdup(ds_c_str(&tokstr));
- lex_force_match(T_STRING);
+ lex_match (lexer, T_SLASH);
- lex_match ('/');
-
- if ( ! lex_match_id ("PERMISSIONS"))
+ if ( ! lex_match_id (lexer, "PERMISSIONS"))
goto error;
- lex_match('=');
+ lex_match (lexer, T_EQUALS);
- if ( lex_match_id("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("WRITEABLE"))
+ else if ( lex_match_id (lexer, "WRITEABLE"))
{
- if ( ! change_permissions(fn, PER_RW ) )
+ if ( ! change_permissions(fn, PER_RW ) )
goto error;
}
else
{
- msg(ME, _("Expecting %s or %s."), "WRITEABLE", "READONLY");
+ lex_error_expecting (lexer, "WRITEABLE", "READONLY", NULL_SENTINEL);
goto error;
}
@@ -92,37 +94,43 @@ cmd_permissions (void)
int
-change_permissions(const char *file_name, enum PER per)
+change_permissions (const char *file_name, enum PER per)
{
+ char *locale_file_name;
struct stat buf;
mode_t mode;
- if (get_safer_mode ())
+ if (settings_get_safer_mode ())
{
msg (SE, _("This command not allowed when the SAFER option is set."));
- return CMD_FAILURE;
+ 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(ME,_("Cannot stat %s: %s"), file_name, strerror(errnum));
+ 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 ;
+ 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(ME,_("Cannot change mode of %s: %s"), file_name, strerror(errnum));
+ msg (SE, _("Cannot change mode of %s: %s"), file_name, strerror(errnum));
+ free (locale_file_name);
return 0;
}
+ free (locale_file_name);
+
return 1;
}