X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Futilities%2Fpermissions.c;h=ad9ffe751732037db38dfc2297cdde2bc58a6886;hb=55e6e7ba37a30570f5a31e2d78c22dfa7b61a36f;hp=bce2194a83dcd603ffc12ccc7ec5064579ea24b1;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp-builds.git
diff --git a/src/language/utilities/permissions.c b/src/language/utilities/permissions.c
index bce2194a..ad9ffe75 100644
--- a/src/language/utilities/permissions.c
+++ b/src/language/utilities/permissions.c
@@ -1,24 +1,21 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2004 Free Software Foundation, Inc.
- Author: John Darrington
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2004, 2010 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
@@ -29,7 +26,6 @@
#include
#include
#include
-#include "stat-macros.h"
#include
#include "gettext.h"
@@ -46,30 +42,33 @@ cmd_permissions (struct lexer *lexer, struct dataset *ds UNUSED)
{
char *fn = 0;
- lex_match (lexer, '/');
+ 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));
+ if (!lex_force_string (lexer))
+ return CMD_FAILURE;
+
+ fn = ss_xstrdup (lex_tokss (lexer));
lex_force_match (lexer, T_STRING);
- lex_match (lexer, '/');
-
+ lex_match (lexer, T_SLASH);
+
if ( ! lex_match_id (lexer, "PERMISSIONS"))
goto error;
- lex_match (lexer, '=');
+ lex_match (lexer, T_EQUALS);
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"))
{
- if ( ! change_permissions(fn, PER_RW ) )
+ if ( ! change_permissions(fn, PER_RW ) )
goto error;
}
else
@@ -92,19 +91,19 @@ cmd_permissions (struct lexer *lexer, struct dataset *ds UNUSED)
int
-change_permissions(const char *file_name, enum PER per)
+change_permissions (const char *file_name, enum PER per)
{
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;
}
- if ( -1 == stat(file_name, &buf) )
+ if ( -1 == stat(file_name, &buf) )
{
const int errnum = errno;
msg (SE, _("Cannot stat %s: %s"), file_name, strerror(errnum));
@@ -112,9 +111,9 @@ change_permissions(const char *file_name, enum PER per)
}
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))