X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fpermissions.c;h=83fa820c562d3be6473ef70afa49dd95a5b6ecc6;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=fec6b4fc3034ca882d66394b94c6d615ae4c369a;hpb=9b94efd7513afdb12a6023024e00e50801532fee;p=pspp-builds.git
diff --git a/src/language/utilities/permissions.c b/src/language/utilities/permissions.c
index fec6b4fc..83fa820c 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,19 @@
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/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -42,21 +43,24 @@ 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);
+
+ if (!lex_force_string (lexer))
+ return CMD_FAILURE;
- fn = ds_xstrdup (lex_tokstr (lexer));
+ 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"))
{
@@ -108,9 +112,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))