JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* mkgroup.c (usage): Move info message that this /etc/group isn't really

Browse Source 
required anymore more to the top of the usage output.
	* mkpasswd.c (usage): Ditto for /etc/passwd.  Drop old text from output.
This commit is contained in:
Corinna Vinschen
2014-07-29 13:29:54 +00:00
parent 898e26c82f
commit c72a0d361d
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/utils/ChangeLog
View File

@@ -1,3 +1,9 @@
2014-07-29 Corinna Vinschen <corinna@vinschen.de>
* mkgroup.c (usage): Move info message that this /etc/group isn't really
required anymore more to the top of the usage output.
* mkpasswd.c (usage): Ditto for /etc/passwd. Drop old text from output.
2014-06-16 Corinna Vinschen <corinna@vinschen.de>
* passwd.c (main): Fix typo in error output.

7
winsup/utils/mkgroup.c
View File

@@ -476,6 +476,9 @@ usage (FILE * stream)
"\n"
"Write /etc/group-like output to stdout\n"
"\n"
"Don't use this command to generate a local /etc/group file, unless you\n"
"really need one. See the Cygwin User's Guide for more information.\n"
"\n"
"Options:\n"
"\n"
" -l,--local [machine] print local groups\n"
@@ -499,9 +502,7 @@ usage (FILE * stream)
" -v,--version print version information and exit\n"
"\n"
"Default is to print local groups on stand-alone machines, plus domain\n"
"groups on domain controllers and domain member machines.\n\n"
"Don't use this command to generate a local /etc/group file, unless you\n"
"really need one. See the Cygwin User's Guide for more information.\n"
"groups on domain controllers and domain member machines.\n"
"\n", program_invocation_short_name,
(const char *) cygwin_internal (CW_GETNSSSEP));
return 1;

11
winsup/utils/mkpasswd.c
View File

@@ -365,12 +365,15 @@ usage (FILE * stream)
"\n"
"Write /etc/passwd-like output to stdout\n"
"\n"
"Don't use this command to generate a local /etc/passwd file, unless you\n"
"really need one. See the Cygwin User's Guide for more information.\n"
"\n"
"Options:\n"
"\n"
" -l,--local [machine] print local user accounts with uid offset offset\n"
" -l,--local [machine] print local user accounts\n"
" (from local machine if no machine specified)\n"
" -L,--Local machine ditto, but generate username with machine prefix\n"
" -d,--domain [domain] print domain accounts with uid offset offset\n"
" -d,--domain [domain] print domain accounts\n"
" (from current domain if no domain specified)\n"
" -c,--current print current user\n"
" -S,--separator char for -l use character char as domain\\user\n"
@@ -390,9 +393,7 @@ usage (FILE * stream)
" -V,--version version information and exit\n"
"\n"
"Default is to print local accounts on stand-alone machines, domain accounts\n"
"on domain controllers and domain member machines.\n\n"
"Don't use this command to generate a local /etc/passwd file, unless you\n"
"really need one. See the Cygwin User's Guide for more information.\n"
"on domain controllers and domain member machines.\n"
"\n", program_invocation_short_name,
(const char *) cygwin_internal (CW_GETNSSSEP));
return 1;

16
winsup/utils/utils.xml
View File

@@ -877,6 +877,9 @@ Usage: mkgroup [OPTION]...
Write /etc/group-like output to stdout
Don't use this command to generate a local /etc/group file, unless you
really need one. See the Cygwin User's Guide for more information.
Options:
-l,--local [machine] print local groups
@@ -901,9 +904,6 @@ Options:
Default is to print local groups on stand-alone machines, plus domain
groups on domain controllers and domain member machines.
Don't use this command to generate a local /etc/group file, unless you
really need one. See the Cygwin User's Guide for more information.
</screen>
<para>The <command>mkgroup</command> program can be used to create a local
@@ -963,12 +963,15 @@ Usage: mkpasswd [OPTIONS]...
Write /etc/passwd-like output to stdout
Don't use this command to generate a local /etc/passwd file, unless you
really need one. See the Cygwin User's Guide for more information.
Options:
-l,--local [machine] print local user accounts with uid offset offset
-l,--local [machine] print local user accounts
(from local machine if no machine specified)
-L,--Local machine ditto, but generate username with machine prefix
-d,--domain [domain] print domain accounts with uid offset offset
-d,--domain [domain] print domain accounts
(from current domain if no domain specified)
-c,--current print current user
-S,--separator char for -l use character char as domain\user
@@ -989,9 +992,6 @@ Options:
Default is to print local accounts on stand-alone machines, domain accounts
on domain controllers and domain member machines.
Don't use this command to generate a local /etc/passwd file, unless you
really need one. See the Cygwin User's Guide for more information.
</screen>
<para>The <command>mkpasswd</command> program can be used to create a