X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Flanguage%2Futilities%2Fpermissions.c;h=1de2175a47f121ea0feccdc0e5126906ff677adc;hb=a46ed36dcbab01d36c08cf560ff96a7effd9779a;hp=100317bb9b30ac24d1016b41b0c6d7ef180215d7;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git

diff --git a/src/language/utilities/permissions.c b/src/language/utilities/permissions.c
index 100317bb..1de2175a 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 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,7 +15,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <libpspp/message.h>
+
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -47,6 +47,9 @@ cmd_permissions (struct lexer *lexer, struct dataset *ds UNUSED)
   if (lex_match_id (lexer, "FILE"))
     lex_match (lexer, '=');
 
+  if (!lex_force_string (lexer))
+    return CMD_FAILURE;
+
   fn = ds_xstrdup (lex_tokstr (lexer));
   lex_force_match (lexer, T_STRING);
 
@@ -88,12 +91,12 @@ 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;
@@ -108,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))