From fa2ee7da0a442f42f4672515bb3b48dd8f5a146e Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 14 Jan 2004 02:30:25 +0000 Subject: [PATCH] added and documented '-x' switch git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@598 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/src/chxid.c | 5 +++-- util-vserver/src/lsxid.c | 5 +++-- util-vserver/src/setattr.c | 5 +++-- util-vserver/src/showattr.c | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/util-vserver/src/chxid.c b/util-vserver/src/chxid.c index 1af6c53..42bdd17 100644 --- a/util-vserver/src/chxid.c +++ b/util-vserver/src/chxid.c @@ -38,7 +38,7 @@ CMDLINE_OPTIONS[] = { { 0,0,0,0 } }; -char const CMDLINE_OPTIONS_SHORT[] = "Rc:"; +char const CMDLINE_OPTIONS_SHORT[] = "Rc:x"; void showHelp(int fd, char const *cmd, int res) @@ -46,10 +46,11 @@ showHelp(int fd, char const *cmd, int res) WRITE_MSG(fd, "Usage: "); WRITE_STR(fd, cmd); WRITE_MSG(fd, - " -c [-R] [--] +\n\n" + " -c [-Rx] [--] +\n\n" " Options:\n" " -R ... recurse through directories\n" " -c ... assign the given context/vserver to the file(s)\n" + " -x ... do not cross filesystems\n\n" "Please report bugs to " PACKAGE_BUGREPORT "\n"); exit(res); } diff --git a/util-vserver/src/lsxid.c b/util-vserver/src/lsxid.c index cc7cd18..38d4c83 100644 --- a/util-vserver/src/lsxid.c +++ b/util-vserver/src/lsxid.c @@ -41,7 +41,7 @@ CMDLINE_OPTIONS[] = { { 0,0,0,0 } }; -char const CMDLINE_OPTIONS_SHORT[] = "Radn"; +char const CMDLINE_OPTIONS_SHORT[] = "Radnx"; void showHelp(int fd, char const *cmd, int res) @@ -49,13 +49,14 @@ showHelp(int fd, char const *cmd, int res) WRITE_MSG(fd, "Usage: "); WRITE_STR(fd, cmd); WRITE_MSG(fd, - " [-Radn] [--] *\n\n" + " [-Radnx] [--] *\n\n" " Options:\n" " -R ... recurse through directories\n" " -a ... display files starting with '.' also\n" " -d ... list directories like other files instead of\n" " listing their content\n" " -n ... do not try to do xid -> vserver-name mapping\n" + " -x ... do not cross filesystems\n\n" "Please report bugs to " PACKAGE_BUGREPORT "\n"); exit(res); } diff --git a/util-vserver/src/setattr.c b/util-vserver/src/setattr.c index 74de450..959c086 100644 --- a/util-vserver/src/setattr.c +++ b/util-vserver/src/setattr.c @@ -42,7 +42,7 @@ CMDLINE_OPTIONS[] = { { 0,0,0,0 } }; -char const CMDLINE_OPTIONS_SHORT[] = "Rsu"; +char const CMDLINE_OPTIONS_SHORT[] = "Rsux"; static long set_mask = 0; static long del_mask = VC_IMMUTABLE_ALL; @@ -53,12 +53,13 @@ showHelp(int fd, char const *cmd, int res) WRITE_MSG(fd, "Usage: "); WRITE_STR(fd, cmd); WRITE_MSG(fd, - " [-Rsu] [--immutable] [--immulink] [--] +\n\n" + " [-Rsux] [--immutable] [--immulink] [--] +\n\n" " Options:\n" " -R ... recurse through directories\n" " -s ... set flag only; when only one of the '--immu*' options\n" " is given, do not delete the other ones\n" " -u ... revert operation and unset the given flags\n" + " -x ... do not cross filesystems\n\n" "Please report bugs to " PACKAGE_BUGREPORT "\n"); exit(res); } diff --git a/util-vserver/src/showattr.c b/util-vserver/src/showattr.c index cf68304..e7db359 100644 --- a/util-vserver/src/showattr.c +++ b/util-vserver/src/showattr.c @@ -43,7 +43,7 @@ CMDLINE_OPTIONS[] = { { 0,0,0,0 } }; -char const CMDLINE_OPTIONS_SHORT[] = "Rad"; +char const CMDLINE_OPTIONS_SHORT[] = "Radx"; void showHelp(int fd, char const *cmd, int res) @@ -51,12 +51,13 @@ showHelp(int fd, char const *cmd, int res) WRITE_MSG(fd, "Usage: "); WRITE_STR(fd, cmd); WRITE_MSG(fd, - " [-Rad] [--] *\n\n" + " [-Radx] [--] *\n\n" " Options:\n" " -R ... recurse through directories\n" " -a ... display files starting with '.' also\n" " -d ... list directories like other files instead of listing\n" " their content\n" + " -x ... do not cross filesystems\n\n" "Please report bugs to " PACKAGE_BUGREPORT "\n"); exit(res); } -- 1.8.1.5