diff --git a/toolbox/Android.mk b/toolbox/Android.mk index c5942a370..f3f86838b 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -105,13 +105,6 @@ LOCAL_MODULE := libtoolbox_rmdir LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_LIBRARY) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := upstream-netbsd/bin/sleep/sleep.c -LOCAL_CFLAGS += $(common_cflags) -Dmain=sleep_main -LOCAL_MODULE := libtoolbox_sleep -LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk -include $(BUILD_STATIC_LIBRARY) - include $(CLEAR_VARS) @@ -128,7 +121,6 @@ BSD_TOOLS := \ printenv \ rm \ rmdir \ - sleep \ OUR_TOOLS := \ chcon \ diff --git a/toolbox/upstream-netbsd/bin/sleep/sleep.c b/toolbox/upstream-netbsd/bin/sleep/sleep.c deleted file mode 100644 index 4349af439..000000000 --- a/toolbox/upstream-netbsd/bin/sleep/sleep.c +++ /dev/null @@ -1,159 +0,0 @@ -/* $NetBSD: sleep.c,v 1.24 2011/08/29 14:51:19 joerg Exp $ */ - -/* - * Copyright (c) 1988, 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 -#ifndef lint -__COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\ - The Regents of the University of California. All rights reserved."); -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94"; -#else -__RCSID("$NetBSD: sleep.c,v 1.24 2011/08/29 14:51:19 joerg Exp $"); -#endif -#endif /* not lint */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -__dead static void alarmhandle(int); -__dead static void usage(void); - -static volatile sig_atomic_t report_requested; -static void -report_request(int signo __unused) -{ - - report_requested = 1; -} - -int -main(int argc, char *argv[]) -{ - char *arg, *temp; - double fval, ival, val; - struct timespec ntime; - time_t original; - int ch, fracflag, rv; - - setprogname(argv[0]); - (void)setlocale(LC_ALL, ""); - - (void)signal(SIGALRM, alarmhandle); - - while ((ch = getopt(argc, argv, "")) != -1) - switch(ch) { - default: - usage(); - } - argc -= optind; - argv += optind; - - if (argc != 1) - usage(); - - /* - * Okay, why not just use atof for everything? Why bother - * checking if there is a fraction in use? Because the old - * sleep handled the full range of integers, that's why, and a - * double can't handle a large long. This is fairly useless - * given how large a number a double can hold on most - * machines, but now we won't ever have trouble. If you want - * 1000000000.9 seconds of sleep, well, that's your - * problem. Why use an isdigit() check instead of checking for - * a period? Because doing it this way means locales will be - * handled transparently by the atof code. - */ - fracflag = 0; - arg = *argv; - for (temp = arg; *temp != '\0'; temp++) - if (!isdigit((unsigned char)*temp)) - fracflag++; - - if (fracflag) { - val = atof(arg); - if (val <= 0) - usage(); - ival = floor(val); - fval = (1000000000 * (val-ival)); - ntime.tv_sec = ival; - ntime.tv_nsec = fval; - } - else { - ntime.tv_sec = atol(arg); - if (ntime.tv_sec <= 0) - return EXIT_SUCCESS; - ntime.tv_nsec = 0; - } - - original = ntime.tv_sec; - signal(SIGINFO, report_request); - while ((rv = nanosleep(&ntime, &ntime)) != 0) { - if (report_requested) { - /* Reporting does not bother with nanoseconds. */ - warnx("about %d second(s) left out of the original %d", - (int)ntime.tv_sec, (int)original); - report_requested = 0; - } else - break; - } - - if (rv == -1) - err(EXIT_FAILURE, "nanosleep failed"); - - return EXIT_SUCCESS; - /* NOTREACHED */ -} - -static void -usage(void) -{ - (void)fprintf(stderr, "usage: %s seconds\n", getprogname()); - exit(EXIT_FAILURE); - /* NOTREACHED */ -} - -/* ARGSUSED */ -static void -alarmhandle(int i) -{ - _exit(EXIT_SUCCESS); - /* NOTREACHED */ -}