diff options
author | Elliott Hughes <enh@google.com> | 2014-11-24 15:32:51 -0800 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2014-11-24 15:32:51 -0800 |
commit | 64d29446742159dcbe9e03c95b782d86b6c29244 (patch) | |
tree | fc3e2b7a81a0cfea820078d4886e9ead6a6a6ca9 /toolbox | |
parent | bcece29c4438c6b92c973d30bc8a46331f16369f (diff) | |
download | system_core-64d29446742159dcbe9e03c95b782d86b6c29244.zip system_core-64d29446742159dcbe9e03c95b782d86b6c29244.tar.gz system_core-64d29446742159dcbe9e03c95b782d86b6c29244.tar.bz2 |
Lose printenv to toybox.
Change-Id: Icdc6766a7ef853bc846fe811fa2ad2284ed8a18f
Diffstat (limited to 'toolbox')
-rw-r--r-- | toolbox/Android.mk | 8 | ||||
-rw-r--r-- | toolbox/upstream-netbsd/usr.bin/printenv/printenv.c | 102 |
2 files changed, 0 insertions, 110 deletions
diff --git a/toolbox/Android.mk b/toolbox/Android.mk index f3f8683..e135e4d 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -85,13 +85,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES := upstream-netbsd/usr.bin/printenv/printenv.c -LOCAL_CFLAGS += $(common_cflags) -Dmain=printenv_main -LOCAL_MODULE := libtoolbox_printenv -LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk -include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) LOCAL_SRC_FILES := upstream-netbsd/bin/rm/rm.c LOCAL_CFLAGS += $(common_cflags) -Dmain=rm_main LOCAL_MODULE := libtoolbox_rm @@ -118,7 +111,6 @@ BSD_TOOLS := \ kill \ ln \ mv \ - printenv \ rm \ rmdir \ diff --git a/toolbox/upstream-netbsd/usr.bin/printenv/printenv.c b/toolbox/upstream-netbsd/usr.bin/printenv/printenv.c deleted file mode 100644 index e15384f..0000000 --- a/toolbox/upstream-netbsd/usr.bin/printenv/printenv.c +++ /dev/null @@ -1,102 +0,0 @@ -/* $NetBSD: printenv.c,v 1.12 2011/09/06 18:26:55 joerg Exp $ */ - -/* - * Copyright (c) 1987, 1993 - * 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) 1987, 1993\ - The Regents of the University of California. All rights reserved."); -#endif /* not lint */ - -#ifndef lint -/*static char sccsid[] = "from: @(#)printenv.c 8.2 (Berkeley) 5/4/95";*/ -__RCSID("$NetBSD: printenv.c,v 1.12 2011/09/06 18:26:55 joerg Exp $"); -#endif /* not lint */ - -#include <sys/types.h> - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <err.h> - -__dead static void usage(void); - -/* - * printenv - * - * Bill Joy, UCB - * February, 1979 - */ -int -main(int argc, char *argv[]) -{ - extern char **environ; - char *cp, **ep; - size_t len; - int ch; - - while ((ch = getopt(argc, argv, "")) != -1) - switch(ch) { - case '?': - default: - usage(); - } - argc -= optind; - argv += optind; - - if (argc == 0) { - for (ep = environ; *ep; ep++) - (void)printf("%s\n", *ep); - exit(0); - } - if (argc != 1) - usage(); - if (strchr(*argv, '=') != NULL) - errx(1, "Invalid environment variable %s", *argv); - len = strlen(*argv); - for (ep = environ; *ep; ep++) - if (!memcmp(*ep, *argv, len)) { - cp = *ep + len; - if (!*cp || *cp == '=') { - (void)printf("%s\n", *cp ? cp + 1 : cp); - exit(0); - } - } - exit(1); -} - -static void -usage(void) -{ - (void)fprintf(stderr, "Usage: printenv [name]\n"); - exit(1); -} |