aboutsummaryrefslogtreecommitdiffstats
path: root/src/chmod.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2006-04-17 23:22:51 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2006-04-17 23:22:51 +0000
commit137de3d3b6b79c19088e0c15c0157a26dd1dcd57 (patch)
tree822243fec8f37b271fac735ee5cc7acb7950e0bf /src/chmod.c
parent(gl_FILEMODE): Check for strmode declaration. (diff)
downloadcoreutils-137de3d3b6b79c19088e0c15c0157a26dd1dcd57.tar.gz
coreutils-137de3d3b6b79c19088e0c15c0157a26dd1dcd57.zip
(describe_change): Adjust to filemode changes.
Diffstat (limited to 'src/chmod.c')
-rw-r--r--src/chmod.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/chmod.c b/src/chmod.c
index 098118c18..75d1b874f 100644
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -1,5 +1,5 @@
/* chmod -- change permission modes of files
- Copyright (C) 89, 90, 91, 1995-2005 Free Software Foundation, Inc.
+ Copyright (C) 89, 90, 91, 1995-2006 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
@@ -143,7 +143,7 @@ static void
describe_change (const char *file, mode_t mode,
enum Change_status changed)
{
- char perms[11]; /* "-rwxrwxrwx" ls-style modes. */
+ char perms[12]; /* "-rwxrwxrwx" ls-style modes. */
const char *fmt;
if (changed == CH_NOT_APPLIED)
@@ -153,8 +153,8 @@ describe_change (const char *file, mode_t mode,
return;
}
- mode_string (mode, perms);
- perms[10] = '\0'; /* `mode_string' does not null terminate. */
+ strmode (mode, perms);
+ perms[10] = '\0'; /* Remove trailing space. */
switch (changed)
{
case CH_SUCCEEDED:
@@ -259,10 +259,10 @@ process_file (FTS *fts, FTSENT *ent)
mode_t naively_expected_mode = mode_adjust (old_mode, change, 0);
if (new_mode & ~naively_expected_mode)
{
- char new_perms[11];
- char naively_expected_perms[11];
- mode_string (new_mode, new_perms);
- mode_string (naively_expected_mode, naively_expected_perms);
+ char new_perms[12];
+ char naively_expected_perms[12];
+ strmode (new_mode, new_perms);
+ strmode (naively_expected_mode, naively_expected_perms);
new_perms[10] = naively_expected_perms[10] = '\0';
error (0, 0,
_("%s: new permissions are %s, not %s"),