X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Futilities%2Fpermissions.c;h=15a89c5c64106b2e1ed4d96aa178985049e89eac;hb=8019f5ebb77a3b010ff63b14ba69d70810b040fb;hp=05a503ca2894b65d280c614e8d6b010867df8c1e;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp

diff --git a/src/language/utilities/permissions.c b/src/language/utilities/permissions.c
index 05a503ca28..15a89c5c64 100644
--- a/src/language/utilities/permissions.c
+++ b/src/language/utilities/permissions.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 2004 Free Software Foundation, Inc.
-   Author: John Darrington
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -18,63 +17,63 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
-#include "settings.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "misc.h"
+#include <data/settings.h>
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
 #include "stat-macros.h"
-#include "str.h"
+#include <libpspp/str.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
 enum PER {PER_RO, PER_RW};
 
-int change_permissions(const char *filename, enum PER per);
+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, '/');
 
-  if (lex_match_id ("FILE"))
-    lex_match ('=');
+  if (lex_match_id (lexer, "FILE"))
+    lex_match (lexer, '=');
 
-  fn = strdup(ds_c_str(&tokstr));
-  lex_force_match(T_STRING);
+  fn = ds_xstrdup (lex_tokstr (lexer));
+  lex_force_match (lexer, T_STRING);
 
 
-  lex_match ('/');
+  lex_match (lexer, '/');
   
-  if ( ! lex_match_id ("PERMISSIONS"))
+  if ( ! lex_match_id (lexer, "PERMISSIONS"))
     goto error;
 
-  lex_match('=');
+  lex_match (lexer, '=');
 
-  if ( lex_match_id("READONLY"))
+  if ( lex_match_id (lexer, "READONLY"))
     {
       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 ) ) 
 	goto error;
     }
   else
     {
-      msg(ME, _("Expecting %s or %s."), "WRITEABLE", "READONLY");
+      msg (SE, _("Expecting %s or %s."), "WRITEABLE", "READONLY");
       goto error;
     }
 
@@ -92,7 +91,7 @@ cmd_permissions (void)
 
 
 int
-change_permissions(const char *filename, enum PER per)
+change_permissions(const char *file_name, enum PER per)
 {
   struct stat buf;
   mode_t mode;
@@ -104,10 +103,10 @@ change_permissions(const char *filename, enum PER per)
     }
 
 
-  if ( -1 == stat(filename, &buf) ) 
+  if ( -1 == stat(file_name, &buf) ) 
     {
       const int errnum = errno;
-      msg(ME,_("Cannot stat %s: %s"), filename, strerror(errnum));
+      msg (SE, _("Cannot stat %s: %s"), file_name, strerror(errnum));
       return 0;
     }
 
@@ -116,11 +115,11 @@ change_permissions(const char *filename, enum PER per)
   else
     mode = buf.st_mode & ~( S_IWOTH | S_IWUSR | S_IWGRP );
 
-  if ( -1 == chmod(filename, mode))
+  if ( -1 == chmod(file_name, mode))
 
     {
       const int errnum = errno;
-      msg(ME,_("Cannot change mode of %s: %s"), filename, strerror(errnum));
+      msg (SE, _("Cannot change mode of %s: %s"), file_name, strerror(errnum));
       return 0;
     }