diff options
author | Elliott Hughes <enh@google.com> | 2014-12-16 15:28:03 -0800 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2014-12-16 15:28:03 -0800 |
commit | ff60f7c94a1d2b6690009fd9908234328a9b6bbd (patch) | |
tree | e5e1d2a62104a9e4f1764a1debe0ee3676a700d2 | |
parent | 8dc9777b33fa073bcd6e1b52f7e9a117978e43f6 (diff) | |
download | system_core-ff60f7c94a1d2b6690009fd9908234328a9b6bbd.zip system_core-ff60f7c94a1d2b6690009fd9908234328a9b6bbd.tar.gz system_core-ff60f7c94a1d2b6690009fd9908234328a9b6bbd.tar.bz2 |
Lose rmdir to toybox.
Change-Id: I80ecc7c19bf7fc44039235c846727853d78a5d15
-rw-r--r-- | toolbox/Android.mk | 8 | ||||
-rw-r--r-- | toolbox/upstream-netbsd/bin/rmdir/rmdir.c | 121 |
2 files changed, 0 insertions, 129 deletions
diff --git a/toolbox/Android.mk b/toolbox/Android.mk index 23b61e9..57ee1d3 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -88,13 +88,6 @@ LOCAL_MODULE := libtoolbox_rm LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_LIBRARY) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := upstream-netbsd/bin/rmdir/rmdir.c -LOCAL_CFLAGS += $(common_cflags) -Dmain=rmdir_main -LOCAL_MODULE := libtoolbox_rmdir -LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk -include $(BUILD_STATIC_LIBRARY) - include $(CLEAR_VARS) @@ -108,7 +101,6 @@ BSD_TOOLS := \ ln \ mv \ rm \ - rmdir \ OUR_TOOLS := \ cmp \ diff --git a/toolbox/upstream-netbsd/bin/rmdir/rmdir.c b/toolbox/upstream-netbsd/bin/rmdir/rmdir.c deleted file mode 100644 index 03261ce..0000000 --- a/toolbox/upstream-netbsd/bin/rmdir/rmdir.c +++ /dev/null @@ -1,121 +0,0 @@ -/* $NetBSD: rmdir.c,v 1.26 2011/08/29 14:49:38 joerg Exp $ */ - -/*- - * Copyright (c) 1992, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <sys/cdefs.h> -#ifndef lint -__COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\ - The Regents of the University of California. All rights reserved."); -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)rmdir.c 8.3 (Berkeley) 4/2/94"; -#else -__RCSID("$NetBSD: rmdir.c,v 1.26 2011/08/29 14:49:38 joerg Exp $"); -#endif -#endif /* not lint */ - -#include <sys/param.h> - -#include <err.h> -#include <locale.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -static int rm_path(char *); -__dead static void usage(void); - -int -main(int argc, char *argv[]) -{ - int ch, errors, pflag; - - setprogname(argv[0]); - (void)setlocale(LC_ALL, ""); - - pflag = 0; - while ((ch = getopt(argc, argv, "p")) != -1) - switch(ch) { - case 'p': - pflag = 1; - break; - case '?': - default: - usage(); - } - argc -= optind; - argv += optind; - - if (argc == 0) - usage(); - - for (errors = 0; *argv; argv++) { - /* We rely on the kernel to ignore trailing '/' characters. */ - if (rmdir(*argv) < 0) { - warn("%s", *argv); - errors = 1; - } else if (pflag) - errors |= rm_path(*argv); - } - - exit(errors); - /* NOTREACHED */ -} - -static int -rm_path(char *path) -{ - char *p; - - while ((p = strrchr(path, '/')) != NULL) { - *p = 0; - if (p[1] == 0) - /* Ignore trailing '/' on deleted name */ - continue; - - if (rmdir(path) < 0) { - warn("%s", path); - return (1); - } - } - - return (0); -} - -static void -usage(void) -{ - (void)fprintf(stderr, "usage: %s [-p] directory ...\n", getprogname()); - exit(1); - /* NOTREACHED */ -} |