mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
maint: refactor common mode bits used to create files
* src/system.h (MODE_RW_UGO): The new refactored define (666). * src/mkfifo.c: Use the new define. * src/mknod.c: Likewise. * src/split.c: Likewise. * src/system.h: Likewise. * src/touch.c: Likewise. * src/truncate.c: Likewise. Suggested-by: Jim Meyering
This commit is contained in:
1 parent
4cfca3916d
commit
30a604e631
7 files changed
+9
-12
No files matched your search
@@ -2211,7 +2211,7 @@ main (int argc, char **argv)
|
||||
}
|
||||
else
|
||||
{
|
||||
mode_t perms = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
|
||||
mode_t perms = MODE_RW_UGO;
|
||||
int opts
|
||||
= (output_flags
|
||||
| (conversions_mask & C_NOCREAT ? 0 : O_CREAT)
|
||||
|
||||
+1
-1
@@ -114,7 +114,7 @@ main (int argc, char **argv)
|
||||
_("failed to set default file creation context to %s"),
|
||||
quote (scontext));
|
||||
|
||||
newmode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
|
||||
newmode = MODE_RW_UGO;
|
||||
if (specified_mode)
|
||||
{
|
||||
struct mode_change *change = mode_compile (specified_mode);
|
||||
|
||||
+1
-1
@@ -120,7 +120,7 @@ main (int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
newmode = (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
|
||||
newmode = MODE_RW_UGO;
|
||||
if (specified_mode)
|
||||
{
|
||||
struct mode_change *change = mode_compile (specified_mode);
|
||||
|
||||
+1
-2
@@ -362,8 +362,7 @@ create (const char *name)
|
||||
{
|
||||
if (verbose)
|
||||
fprintf (stdout, _("creating file %s\n"), quote (name));
|
||||
return open (name, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
|
||||
(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
|
||||
return open (name, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, MODE_RW_UGO);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -30,6 +30,9 @@ you must include <sys/types.h> before including this file
|
||||
|
||||
#include <sys/stat.h>
|
||||
|
||||
/* Commonly used file permission combination. */
|
||||
#define MODE_RW_UGO (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
|
||||
|
||||
#if !defined HAVE_MKFIFO
|
||||
# define mkfifo(name, mode) mknod (name, (mode) | S_IFIFO, 0)
|
||||
#endif
|
||||
|
||||
+1
-4
@@ -131,11 +131,8 @@ touch (const char *file)
|
||||
else if (! (no_create || no_dereference))
|
||||
{
|
||||
/* Try to open FILE, creating it if necessary. */
|
||||
int default_permissions =
|
||||
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
|
||||
fd = fd_reopen (STDIN_FILENO, file,
|
||||
O_WRONLY | O_CREAT | O_NONBLOCK | O_NOCTTY,
|
||||
default_permissions);
|
||||
O_WRONLY | O_CREAT | O_NONBLOCK | O_NOCTTY, MODE_RW_UGO);
|
||||
|
||||
/* Don't save a copy of errno if it's EISDIR, since that would lead
|
||||
touch to give a bogus diagnostic for e.g., 'touch /' (assuming
|
||||
|
||||
+1
-3
@@ -244,7 +244,6 @@ main (int argc, char **argv)
|
||||
off_t size IF_LINT ( = 0);
|
||||
off_t rsize = -1;
|
||||
rel_mode_t rel_mode = rm_abs;
|
||||
mode_t omode;
|
||||
int c, fd = -1, oflags;
|
||||
char const *fname;
|
||||
|
||||
@@ -385,11 +384,10 @@ main (int argc, char **argv)
|
||||
}
|
||||
|
||||
oflags = O_WRONLY | (no_create ? 0 : O_CREAT) | O_NONBLOCK;
|
||||
omode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
|
||||
|
||||
while ((fname = *argv++) != NULL)
|
||||
{
|
||||
if ((fd = open (fname, oflags, omode)) == -1)
|
||||
if ((fd = open (fname, oflags, MODE_RW_UGO)) == -1)
|
||||
{
|
||||
/* 'truncate -s0 -c no-such-file' shouldn't gen error
|
||||
'truncate -s0 no-such-dir/file' should gen ENOENT error
|
||||
|
||||
Reference in new issue
Block a user