Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae96efca authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Lose ln to toybox. 

I accidentally enabled the toybox ln in my original commit, so which ln
you've been running for the last few weeks has depended on which directory
you built more recently...

Change-Id: If73783477aa4eb4d058d6e170d6291ba0d9c5f40
parent a7e6dbd3

toolbox/Android.mk

+0 −8
Original line number Diff line number Diff line
@@ -67,13 +67,6 @@ LOCAL_MODULE := libtoolbox_grep 
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk

include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)

LOCAL_SRC_FILES := upstream-netbsd/bin/ln/ln.c

LOCAL_CFLAGS += $(common_cflags) -Dmain=ln_main

LOCAL_MODULE := libtoolbox_ln

LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk

include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)

LOCAL_SRC_FILES := upstream-netbsd/bin/mv/mv.c

LOCAL_CFLAGS += $(common_cflags) -Dmain=mv_main -D__SVR4
@@ -98,7 +91,6 @@ BSD_TOOLS := \ 
    dd \

    du \

    grep \

    ln \

    mv \

    rm \

toolbox/upstream-netbsd/bin/ln/ln.c

deleted100644 → 0
+0 −230
Original line number Diff line number Diff line 
/* $NetBSD: ln.c,v 1.35 2011/08/29 14:38:30 joerg Exp $ */



/*

 * Copyright (c) 1987, 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) 1987, 1993, 1994\

 The Regents of the University of California.  All rights reserved.");

#endif /* not lint */



#ifndef lint

#if 0

static char sccsid[] = "@(#)ln.c	8.2 (Berkeley) 3/31/94";

#else

__RCSID("$NetBSD: ln.c,v 1.35 2011/08/29 14:38:30 joerg Exp $");

#endif

#endif /* not lint */



#include <sys/param.h>

#include <sys/stat.h>



#include <err.h>

#include <errno.h>

#include <locale.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>



static int	fflag;				/* Unlink existing files. */

static int	hflag;				/* Check new name for symlink first. */

static int	iflag;				/* Interactive mode. */

static int	sflag;				/* Symbolic, not hard, link. */

static int	vflag;                          /* Verbose output */



					/* System link call. */

static int (*linkf)(const char *, const char *);

static char   linkch;



static int	linkit(const char *, const char *, int);

__dead static void	usage(void);



int

main(int argc, char *argv[])

{

	struct stat sb;

	int ch, exitval;

	char *sourcedir;



	setprogname(argv[0]);

	(void)setlocale(LC_ALL, "");



	while ((ch = getopt(argc, argv, "fhinsv")) != -1)

		switch (ch) {

		case 'f':

			fflag = 1;

			iflag = 0;

			break;

		case 'h':

		case 'n':

			hflag = 1;

			break;

		case 'i':

			iflag = 1;

			fflag = 0;

			break;

		case 's':

			sflag = 1;

			break;

		case 'v':               

			vflag = 1;

			break;

		case '?':

		default:

			usage();

			/* NOTREACHED */

		}



	argv += optind;

	argc -= optind;



	if (sflag) {

		linkf  = symlink;

		linkch = '-';

	} else {

		linkf  = link;

		linkch = '=';

	}



	switch(argc) {

	case 0:

		usage();

		/* NOTREACHED */

	case 1:				/* ln target */

		exit(linkit(argv[0], ".", 1));

		/* NOTREACHED */

	case 2:				/* ln target source */

		exit(linkit(argv[0], argv[1], 0));

		/* NOTREACHED */

	}



					/* ln target1 target2 directory */

	sourcedir = argv[argc - 1];

	if (hflag && lstat(sourcedir, &sb) == 0 && S_ISLNK(sb.st_mode)) {

		/* we were asked not to follow symlinks, but found one at

		   the target--simulate "not a directory" error */

		errno = ENOTDIR;

		err(EXIT_FAILURE, "%s", sourcedir);

		/* NOTREACHED */

	}

	if (stat(sourcedir, &sb)) {

		err(EXIT_FAILURE, "%s", sourcedir);

		/* NOTREACHED */

	}

	if (!S_ISDIR(sb.st_mode)) {

		usage();

		/* NOTREACHED */

	}

	for (exitval = 0; *argv != sourcedir; ++argv)

		exitval |= linkit(*argv, sourcedir, 1);

	exit(exitval);

	/* NOTREACHED */

}



static int

linkit(const char *target, const char *source, int isdir)

{

	struct stat sb;

	const char *p;

	char path[MAXPATHLEN];

	int ch, exists, first;



	if (!sflag) {

		/* If target doesn't exist, quit now. */

		if (stat(target, &sb)) {

			warn("%s", target);

			return (1);

		}

	}



	/* If the source is a directory (and not a symlink if hflag),

	   append the target's name. */

	if (isdir ||

	    (!lstat(source, &sb) && S_ISDIR(sb.st_mode)) ||

	    (!hflag && !stat(source, &sb) && S_ISDIR(sb.st_mode))) {

		if ((p = strrchr(target, '/')) == NULL)

			p = target;

		else

			++p;

		(void)snprintf(path, sizeof(path), "%s/%s", source, p);

		source = path;

	}



	exists = !lstat(source, &sb);



	/*

	 * If the file exists, then unlink it forcibly if -f was specified

	 * and interactively if -i was specified.

	 */

	if (fflag && exists) {

		if (unlink(source)) {

			warn("%s", source);

			return (1);

		}

	} else if (iflag && exists) {

		fflush(stdout);

		(void)fprintf(stderr, "replace %s? ", source);



		first = ch = getchar();

		while (ch != '\n' && ch != EOF)

			ch = getchar();

		if (first != 'y' && first != 'Y') {

			(void)fprintf(stderr, "not replaced\n");

			return (1);

		}



		if (unlink(source)) {

			warn("%s", source);

			return (1);

		}

	}



	/* Attempt the link. */

	if ((*linkf)(target, source)) {

		warn("%s", source);

		return (1);

	}

	if (vflag)

		(void)printf("%s %c> %s\n", source, linkch, target);



	return (0);

}



static void

usage(void)

{



	(void)fprintf(stderr,

	    "usage:\t%s [-fhinsv] file1 file2\n\t%s [-fhinsv] file ... directory\n",

	    getprogname(), getprogname());

	exit(1);

	/* NOTREACHED */

}