Delete trailing whitespace at end of lines.

[pspp-builds.git] / src / language / utilities / permissions.c

diff --git a/src/language/utilities/permissions.c b/src/language/utilities/permissions.c
index 940b2d2bfb3655b269020022e065bdfd035c3e48..895d2e379eaea0ff95d91da3004d3e75345ca31f 100644 (file)
--- 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
@@ -29,7 +28,6 @@
 #include <libpspp/message.h>
 #include <language/lexer/lexer.h>
 #include <libpspp/misc.h>
-#include "stat-macros.h"
 #include <libpspp/str.h>
 
 #include "gettext.h"
@@ -37,44 +35,44 @@
 
 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 ('/');
-  
-  if ( ! lex_match_id ("PERMISSIONS"))
+  lex_match (lexer, '/');
+
+  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 ) ) 
+      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");
+      msg (SE, _("Expecting %s or %s."), "WRITEABLE", "READONLY");
       goto error;
     }
 
@@ -92,7 +90,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 +102,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 +114,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;
     }