lobase

Linux port of OpenBSDs userland.
Log | Files | Refs | README

commit d3de4983746a6bcde1f87fd97fcc51c9915d39c8
parent 19e6025a8909e3dd76731054872ab11ff1a00c99
Author: Duncaen <mail@duncano.de>
Date:   Wed, 24 May 2017 02:52:34 +0200

bin/cp: update to OPENBSD_6_1

Diffstat:
bin/cp/cp.c | 9+++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/bin/cp/cp.c b/bin/cp/cp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cp.c,v 1.43 2016/03/07 18:56:33 tb Exp $ */ +/* $OpenBSD: cp.c,v 1.44 2016/10/14 10:51:57 schwarze Exp $ */ /* $NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $ */ /* @@ -58,12 +58,11 @@ #include <errno.h> #include <fcntl.h> #include <fts.h> -#include <locale.h> +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <limits.h> #include "extern.h" @@ -88,8 +87,6 @@ main(int argc, char *argv[]) int Hflag, Lflag, Pflag, ch, fts_options, r; char *target; - (void)setlocale(LC_ALL, ""); - Hflag = Lflag = Pflag = Rflag = 0; while ((ch = getopt(argc, argv, "HLPRfipr")) != -1) switch (ch) { @@ -232,7 +229,7 @@ main(int argc, char *argv[]) type = FILE_TO_DIR; } - exit(copy(argv, type, fts_options)); + return (copy(argv, type, fts_options)); } char *