From 14a4d5989a2415931dec5cdb742576d17ec63970 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 18 Jan 2006 15:57:56 +0000 Subject: [PATCH] bad_keywords --- winsup/utils/Makefile.in | 3 +-- winsup/utils/mkgroup.c | 12 ++++++------ winsup/utils/mkpasswd.c | 16 ++++++++-------- winsup/utils/setfacl.c | 8 ++++---- winsup/utils/ssp.c | 2 +- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index aaafd27a0..05962448a 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -16,7 +16,6 @@ prefix:=@prefix@ exec_prefix:=@exec_prefix@ bindir:=@bindir@ -sysconfdir:=@sysconfdir@ program_transform_name:=@program_transform_name@ override INSTALL:=@INSTALL@ @@ -182,7 +181,7 @@ realclean: clean rm -f Makefile config.cache install: all - $(SHELL) $(updir1)/mkinstalldirs $(bindir) $(sysconfdir) + $(SHELL) $(updir1)/mkinstalldirs $(bindir) for i in $(PROGS) ; do \ n=`echo $$i | sed '$(program_transform_name)'`; \ $(INSTALL_PROGRAM) $$i $(bindir)/$$n; \ diff --git a/winsup/utils/mkgroup.c b/winsup/utils/mkgroup.c index 338fb2491..376162963 100644 --- a/winsup/utils/mkgroup.c +++ b/winsup/utils/mkgroup.c @@ -533,7 +533,7 @@ usage (FILE * stream, int isNT) fprintf (stream, " -h,--help print this message\n" " -v,--version print version information and exit\n\n"); if (isNT) - fprintf (stream, "One of `-l' or `-d' must be given.\n"); + fprintf (stream, "One of '-l' or '-d' must be given.\n"); return 1; } @@ -643,7 +643,7 @@ main (int argc, char **argv) print_version (); return 0; default: - fprintf (stderr, "Try `%s --help' for more information.\n", argv[0]); + fprintf (stderr, "Try '%s --help' for more information.\n", argv[0]); return 1; } } @@ -657,7 +657,7 @@ main (int argc, char **argv) if (!print_local && !print_domain) { - fprintf (stderr, "%s: Specify one of `-l' or `-d'\n", argv[0]); + fprintf (stderr, "%s: Specify one of '-l' or '-d'\n", argv[0]); return 1; } if (optind < argc) @@ -665,7 +665,7 @@ main (int argc, char **argv) if (!print_domain) { fprintf (stderr, "%s: A domain name is only accepted " - "when `-d' is given.\n", argv[0]); + "when '-d' is given.\n", argv[0]); return 1; } domain_specified = 1; @@ -692,12 +692,12 @@ main (int argc, char **argv) if (disp_groupname == NULL) { /* - * Get `system' group + * Get 'system' group */ print_special (print_sids, &sid_nt_auth, 1, SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0); /* - * Get `None' group + * Get 'None' group */ len = 256; GetComputerName (name, &len); diff --git a/winsup/utils/mkpasswd.c b/winsup/utils/mkpasswd.c index 96fec7ad1..e4d9a9684 100644 --- a/winsup/utils/mkpasswd.c +++ b/winsup/utils/mkpasswd.c @@ -522,7 +522,7 @@ usage (FILE * stream, int isNT) " -h,--help displays this message\n" " -v,--version version information and exit\n\n"); if (isNT) - fprintf (stream, "One of `-l', `-d' or `-g' must be given.\n"); + fprintf (stream, "One of '-l', '-d' or '-g' must be given.\n"); return 1; } @@ -622,7 +622,7 @@ main (int argc, char **argv) case 'p': if (optarg[0] != '/') { - fprintf (stderr, "%s: `%s' is not a fully qualified path.\n", + fprintf (stderr, "%s: '%s' is not a fully qualified path.\n", argv[0], optarg); return 1; } @@ -640,7 +640,7 @@ main (int argc, char **argv) print_version (); return 0; default: - fprintf (stderr, "Try `%s --help' for more information.\n", argv[0]); + fprintf (stderr, "Try '%s --help' for more information.\n", argv[0]); return 1; } } @@ -679,7 +679,7 @@ main (int argc, char **argv) } if (!print_local && !print_domain && !print_local_groups) { - fprintf (stderr, "%s: Specify one of `-l', `-d' or `-g'\n", argv[0]); + fprintf (stderr, "%s: Specify one of '-l', '-d' or '-g'\n", argv[0]); return 1; } if (optind < argc) @@ -687,7 +687,7 @@ main (int argc, char **argv) if (!print_domain) { fprintf (stderr, "%s: A domain name is only accepted " - "when `-d' is given.\n", argv[0]); + "when '-d' is given.\n", argv[0]); return 1; } domain_specified = 1; @@ -704,18 +704,18 @@ main (int argc, char **argv) { #if 0 /* - * Get `Everyone' group + * Get 'Everyone' group */ print_special (print_sids, &sid_world_auth, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0); #endif /* - * Get `system' group + * Get 'system' group */ print_special (print_sids, &sid_nt_auth, 1, SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0); /* - * Get `administrators' group + * Get 'administrators' group */ if (!print_local_groups) print_special (print_sids, &sid_nt_auth, 2, SECURITY_BUILTIN_DOMAIN_RID, diff --git a/winsup/utils/setfacl.c b/winsup/utils/setfacl.c index 996b5ec7f..deb0707f1 100644 --- a/winsup/utils/setfacl.c +++ b/winsup/utils/setfacl.c @@ -318,12 +318,12 @@ usage (FILE * stream) "\n" " d[efault]:u[ser]:uid:perm\n" "\n" - " `perm' is either a 3-char permissions string in the form\n" + " 'perm' is either a 3-char permissions string in the form\n" " \"rwx\" with the character - for no permission\n" " or it is the octal representation of the permissions, a\n" " value from 0 (equivalent to \"---\") to 7 (\"rwx\").\n" - " `uid' is a user name or a numerical uid.\n" - " `gid' is a group name or a numerical gid.\n" + " 'uid' is a user name or a numerical uid.\n" + " 'gid' is a group name or a numerical gid.\n" "\n" "\n" "For each file given as parameter, %s will either replace its\n" @@ -383,7 +383,7 @@ usage (FILE * stream) "account currently.\n", prog_name); } else - fprintf(stream, "Try `%s --help' for more information.\n", prog_name); + fprintf(stream, "Try '%s --help' for more information.\n", prog_name); } struct option longopts[] = { diff --git a/winsup/utils/ssp.c b/winsup/utils/ssp.c index 21a4b4b59..6d81ddb63 100644 --- a/winsup/utils/ssp.c +++ b/winsup/utils/ssp.c @@ -900,7 +900,7 @@ main (int argc, char **argv) hits = (HISTCOUNTER *)malloc (high_pc-low_pc+4); memset (hits, 0, high_pc-low_pc+4); - fprintf (stderr, "prun: [%08x,%08x] Running `%s'\n", + fprintf (stderr, "prun: [%08x,%08x] Running '%s'\n", low_pc, high_pc, argv[optind]); run_program (argv[optind]);