projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NPAR TESTS: Accept .313 instead of .312 for point probability in SIGN test.
[pspp-builds.git]
/
src
/
language
/
utilities
/
permissions.c
diff --git
a/src/language/utilities/permissions.c
b/src/language/utilities/permissions.c
index 100317bb9b30ac24d1016b41b0c6d7ef180215d7..1de2175a47f121ea0feccdc0e5126906ff677adc 100644
(file)
--- a/
src/language/utilities/permissions.c
+++ b/
src/language/utilities/permissions.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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>
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>
#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_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);
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
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;
{
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;
{
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 )
}
if ( per == PER_RW )
- mode = buf.st_mode |
S_IWUSR
;
+ mode = buf.st_mode |
0200
;
else
else
- mode = buf.st_mode & ~
( S_IWOTH | S_IWUSR | S_IWGRP )
;
+ mode = buf.st_mode & ~
0222
;
if ( -1 == chmod(file_name, mode))
if ( -1 == chmod(file_name, mode))