am 3d5b5162: am 7f187c5f: Merge "Lose clear, false, and true to toybox." (2780223e) · Commits · e / os / android_system_core

toolbox/Android.mk

+0 −17

Original line number	Diff line number	Diff line
		@@ -51,13 +51,6 @@ LOCAL_MODULE := libtoolbox_du
		LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
		include $(BUILD_STATIC_LIBRARY)

		include $(CLEAR_VARS)
		LOCAL_SRC_FILES := upstream-freebsd/usr.bin/false/false.c
		LOCAL_CFLAGS += $(common_cflags) -Dmain=false_main
		LOCAL_MODULE := libtoolbox_false
		LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
		include $(BUILD_STATIC_LIBRARY)

		include $(CLEAR_VARS)
		LOCAL_SRC_FILES := \
		upstream-netbsd/usr.bin/grep/fastgrep.c \
		@@ -126,13 +119,6 @@ LOCAL_MODULE := libtoolbox_sync
		LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
		include $(BUILD_STATIC_LIBRARY)

		include $(CLEAR_VARS)
		LOCAL_SRC_FILES := upstream-freebsd/usr.bin/true/true.c
		LOCAL_CFLAGS += $(common_cflags) -Dmain=true_main
		LOCAL_MODULE := libtoolbox_true
		LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
		include $(BUILD_STATIC_LIBRARY)


		include $(CLEAR_VARS)

		@@ -142,7 +128,6 @@ BSD_TOOLS := \
		cp \
		dd \
		du \
		false \
		grep \
		kill \
		ln \
		@@ -152,12 +137,10 @@ BSD_TOOLS := \
		rmdir \
		sleep \
		sync \
		true \

		OUR_TOOLS := \
		chcon \
		chmod \
		clear \
		cmp \
		date \
		df \

toolbox/clear.c

deleted100644 → 0

+0 −41

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012, The Android Open Source Project
		* All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * 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.
		* * Neither the name of Google, Inc. 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 COPYRIGHT HOLDERS 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
		* COPYRIGHT OWNER 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 <stdio.h>

		int clear_main(int argc, char **argv) {
		/* This prints the clear screen and move cursor to top-left corner control
		* characters for VT100 terminals. This means it will not work on
		* non-VT100 compliant terminals, namely Windows' cmd.exe, but should
		* work on anything unix-y. */
		fputs("\x1b[2J\x1b[H", stdout);
		return 0;
		}

toolbox/upstream-freebsd/usr.bin/false/false.c

deleted100644 → 0

+0 −46

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 1988, 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.
		* 4. 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.
		*/

		#ifndef lint
		static const char copyright[] =
		"@(#) Copyright (c) 1988, 1993\n\
		The Regents of the University of California. All rights reserved.\n";
		#endif /* not lint */

		#ifndef lint
		static const char sccsid[] = "@(#)false.c 8.1 (Berkeley) 6/6/93";
		#endif /* not lint */
		#include <sys/cdefs.h>
		__FBSDID("$FreeBSD$");

		int
		main(void)
		{
		return 1;
		}

toolbox/upstream-freebsd/usr.bin/true/true.c

deleted100644 → 0

+0 −46

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 1988, 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.
		* 4. 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.
		*
		* $FreeBSD$
		*/

		#ifndef lint
		static const char copyright[] =
		"@(#) Copyright (c) 1988, 1993\n\
		The Regents of the University of California. All rights reserved.\n";
		#endif /* not lint */

		#ifndef lint
		static const char sccsid[] = "@(#)true.c 8.1 (Berkeley) 6/9/93";
		#endif /* not lint */

		int
		main(void)
		{
		return 0;
		}