diff options
Diffstat (limited to 'src/touch.c')
| -rw-r--r-- | src/touch.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/touch.c b/src/touch.c index 368516e7..3a3ffbe0 100644 --- a/src/touch.c +++ b/src/touch.c @@ -1,5 +1,5 @@ /* touch -- change modification and access times of files - Copyright (C) 1987-2012 Free Software Foundation, Inc. + Copyright (C) 1987-2013 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 @@ -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 @@ -172,7 +169,7 @@ touch (const char *file) { if (close (STDIN_FILENO) != 0) { - error (0, errno, _("closing %s"), quote (file)); + error (0, errno, _("failed to close %s"), quote (file)); return false; } } @@ -221,11 +218,10 @@ is supplied.\n\ \n\ A FILE argument string of - is handled specially and causes touch to\n\ change the times of the file associated with standard output.\n\ -\n\ -"), stdout); - fputs (_("\ -Mandatory arguments to long options are mandatory for short options too.\n\ "), stdout); + + emit_mandatory_arg_note (); + fputs (_("\ -a change only the access time\n\ -c, --no-create do not create any files\n\ @@ -241,7 +237,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ fputs (_("\ -r, --reference=FILE use this file's times instead of current time\n\ -t STAMP use [[CC]YY]MMDDhhmm[.ss] instead of current time\n\ - --time=WORD change the specified time:\n\ + --time=WORD change the specified time:\n\ WORD is access, atime, or use: equivalent to -a\n\ WORD is modify or mtime: equivalent to -m\n\ "), stdout); |