From a917f24ef7b003dcef54a3db2644cf9cb4bc2db2 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Tue, 13 Apr 2004 08:20:48 +0000 Subject: [PATCH] cleanups git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1446 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/src/chroot-rm.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/util-vserver/src/chroot-rm.c b/util-vserver/src/chroot-rm.c index dc34836..76cfc65 100644 --- a/util-vserver/src/chroot-rm.c +++ b/util-vserver/src/chroot-rm.c @@ -1,6 +1,6 @@ -// $Id$ --*- c++ -*-- +// $Id$ --*- c -*-- -// Copyright (C) 2003 Enrico Scholz <> +// Copyright (C) 2003,2004 Enrico Scholz // // 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 @@ -25,23 +25,25 @@ #include #include #include +#include +#define ENSC_WRAPPERS_PREFIX "chroot-rm: " #define ENSC_WRAPPERS_UNISTD 1 #include int wrapper_exit_code = 1; static void -showHelp(int fd, char const *cmd, int res) +showHelp(char const *cmd) { - WRITE_MSG(fd, "Usage: "); - WRITE_STR(fd, cmd); - WRITE_MSG(fd, - " +\n\n" + WRITE_MSG(1, "Usage: "); + WRITE_STR(1, cmd); + WRITE_MSG(1, + " [--] +\n\n" "This program removes by assuming the current directory\n" "as a chroot directory.\n\n" "Please report bugs to " PACKAGE_BUGREPORT "\n"); - exit(res); + exit(0); } static void @@ -50,32 +52,32 @@ showVersion() WRITE_MSG(1, "chroot-rm " VERSION " -- removes files under current directory\n" "This program is part of " PACKAGE_STRING "\n\n" - "Copyright (C) 2003 Enrico Scholz\n" + "Copyright (C) 2003,2004 Enrico Scholz\n" VERSION_COPYRIGHT_DISCLAIMER); exit(0); } int main(int argc, char *argv[]) { - int i; int res = EXIT_SUCCESS; int idx = 1; - if (argc==1) { + if (argc>1) { + if (strcmp(argv[1], "--help") ==0) showHelp(argv[0]); + if (strcmp(argv[1], "--version")==0) showVersion(); + if (strcmp(argv[1], "--")==0) ++idx; + } + + if (idx==argc) { WRITE_MSG(2, "No files given; use '--help' for more information\n"); return EXIT_FAILURE; } - if (strcmp(argv[1], "--help") ==0) showHelp(1, argv[0], 0); - if (strcmp(argv[1], "--version")==0) showVersion(); - if (strcmp(argv[1], "--")==0) ++idx; Echroot("."); - Echdir("/"); - for (i=idx; i