projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid unfounded warnings from GCC 7.2.
[pspp]
/
src
/
language
/
utilities
/
permissions.c
diff --git
a/src/language/utilities/permissions.c
b/src/language/utilities/permissions.c
index 05a503ca2894b65d280c614e8d6b010867df8c1e..3f679c150e21968370c2b2d283fcdfb7145f4131 100644
(file)
--- a/
src/language/utilities/permissions.c
+++ b/
src/language/utilities/permissions.c
@@
-1,84
+1,86
@@
-/* PSPP - computes sample statistics.
- Copyright (C) 2004 Free Software Foundation, Inc.
- Author: John Darrington
+/* PSPP - a program for statistical analysis.
+ 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 the Free Software Foundation; either version 2 of the
-
License, or
(at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+
but
WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ G
NU G
eneral Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <config.h>
-#include "message.h"
+
+#include <errno.h>
#include <stdlib.h>
#include <stdlib.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <sys/stat.h>
+#include <sys/types.h>
#include <unistd.h>
#include <unistd.h>
-#include <errno.h>
-#include "settings.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "misc.h"
-#include "stat-macros.h"
-#include "str.h"
+
+#include "data/settings.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/cast.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
enum PER {PER_RO, PER_RW};
#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
/* Parses the PERMISSIONS command. */
int
-cmd_permissions (
void
)
+cmd_permissions (
struct lexer *lexer, struct dataset *ds UNUSED
)
{
{
- char *fn = 0;
+ char *fn = NULL;
+ const char *str = NULL;
+ lex_match (lexer, T_SLASH);
- lex_match ('/');
+ if (lex_match_id (lexer, "FILE"))
+ lex_match (lexer, T_EQUALS);
- if (lex_match_id ("FILE"))
- lex_match ('=');
+ str = lex_tokcstr (lexer);
+ if (str)
+ fn = strdup (str);
- fn = strdup(ds_c_str(&tokstr));
-
lex_force_match(T_STRING)
;
+ if (!lex_force_match (lexer, T_STRING) || str == NULL)
+
goto error
;
+ lex_match (lexer, T_SLASH);
- lex_match ('/');
-
- if ( ! lex_match_id ("PERMISSIONS"))
+ if ( ! lex_match_id (lexer, "PERMISSIONS"))
goto error;
goto error;
- lex_match
('='
);
+ lex_match
(lexer, T_EQUALS
);
- 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;
}
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
{
goto error;
}
else
{
-
msg(ME, _("Expecting %s or %s."), "WRITEABLE", "READONLY"
);
+
lex_error_expecting (lexer, "WRITEABLE", "READONLY", NULL_SENTINEL
);
goto error;
}
goto error;
}
- free(fn);
+ free
(fn);
return CMD_SUCCESS;
return CMD_SUCCESS;
@@
-92,37
+94,42
@@
cmd_permissions (void)
int
int
-change_permissions
(const char *file
name, enum PER per)
+change_permissions
(const char *file_
name, enum PER per)
{
{
+ char *locale_file_name;
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
%s option is set."), "SAFER"
);
+ return
0
;
}
}
-
- if ( -1 == stat(
filename, &buf) )
+ locale_file_name = utf8_to_filename (file_name);
+ if ( -1 == stat(
locale_file_name, &buf) )
{
const int errnum = errno;
{
const int errnum = errno;
- msg(ME,_("Cannot stat %s: %s"), filename, strerror(errnum));
+ msg (SE, _("Cannot stat %s: %s"), file_name, strerror(errnum));
+ free (locale_file_name);
return 0;
}
if ( per == PER_RW )
return 0;
}
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(
locale_file_
name, mode))
{
const int errnum = errno;
{
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));
+ free (locale_file_name);
return 0;
}
return 0;
}
+ free (locale_file_name);
+
return 1;
}
return 1;
}