lexer: New function lex_ofs_representation().

[pspp] / src / language / utilities / permissions.c

diff --git a/src/language/utilities/permissions.c b/src/language/utilities/permissions.c
index a52cd198aa2c8aa15d8698806f677124d38c696e..771eb72832dd1de27304976879eb931cb29350e5 100644 (file)
--- a/src/language/utilities/permissions.c
+++ b/src/language/utilities/permissions.c
@@ -43,44 +43,44 @@ int change_permissions(const char *file_name, enum PER per);
 int
 cmd_permissions (struct lexer *lexer, struct dataset *ds UNUSED)
 {
-  char  *fn = 0;
-
+  char  *fn = NULL;
+  const char *str = NULL;
   lex_match (lexer, T_SLASH);
 
   if (lex_match_id (lexer, "FILE"))
     lex_match (lexer, T_EQUALS);
 
-  if (!lex_force_string (lexer))
-    return CMD_FAILURE;
-
-  fn = ss_xstrdup (lex_tokss (lexer));
-  lex_force_match (lexer, T_STRING);
+  str = lex_tokcstr (lexer);
+  if (str)
+    fn = strdup (str);
 
+  if (!lex_force_match (lexer, T_STRING) || str == NULL)
+    goto error;
 
   lex_match (lexer, T_SLASH);
 
-  if ( ! lex_match_id (lexer, "PERMISSIONS"))
+  if (! lex_match_id (lexer, "PERMISSIONS"))
     goto error;
 
   lex_match (lexer, T_EQUALS);
 
-  if ( lex_match_id (lexer, "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 (lexer, "WRITEABLE"))
+  else if (lex_match_id (lexer, "WRITEABLE"))
     {
-      if ( ! change_permissions(fn, PER_RW ) )
+      if (! change_permissions (fn, PER_RW))
        goto error;
     }
   else
     {
-      lex_error_expecting (lexer, "WRITEABLE", "READONLY", NULL_SENTINEL);
+      lex_error_expecting (lexer, "WRITEABLE", "READONLY");
       goto error;
     }
 
-  free(fn);
+  free (fn);
 
   return CMD_SUCCESS;
 
@@ -106,9 +106,8 @@ change_permissions (const char *file_name, enum PER per)
       return 0;
     }
 
-
   locale_file_name = utf8_to_filename (file_name);
-  if ( -1 == stat(locale_file_name, &buf) )
+  if (-1 == stat(locale_file_name, &buf))
     {
       const int errnum = errno;
       msg (SE, _("Cannot stat %s: %s"), file_name, strerror(errnum));
@@ -116,12 +115,12 @@ change_permissions (const char *file_name, enum PER per)
       return 0;
     }
 
-  if ( per == PER_RW )
+  if (per == PER_RW)
     mode = buf.st_mode | 0200;
   else
     mode = buf.st_mode & ~0222;
 
-  if ( -1 == chmod(locale_file_name, mode))
+  if (-1 == chmod(locale_file_name, mode))
 
     {
       const int errnum = errno;