aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2017-05-24 03:12:47 +0200
committerDuncaen <mail@duncano.de>2017-05-24 03:20:11 +0200
commit8bfe450d804d66561174ac8d84315be8d086ea24 (patch)
tree1acf53c770801214a29fd98f337da2564931792c
parent886b29e646941617cc11e35e285b2528135fd534 (diff)
downloadlobase-8bfe450d804d66561174ac8d84315be8d086ea24.tar.gz
bin/rm: update to OPENBSD_6_1
-rw-r--r--bin/rm/rm.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 826d288..ced6d78 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rm.c,v 1.39 2016/06/28 18:00:59 tedu Exp $ */
+/* $OpenBSD: rm.c,v 1.40 2016/10/14 10:51:57 schwarze Exp $ */
/* $NetBSD: rm.c,v 1.19 1995/09/07 06:48:50 jtc Exp $ */
/*-
@@ -34,7 +34,6 @@
#include <sys/stat.h>
#include <sys/mount.h>
-#include <locale.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
@@ -73,8 +72,6 @@ main(int argc, char *argv[])
{
int ch, rflag;
- setlocale(LC_ALL, "");
-
Pflag = rflag = 0;
while ((ch = getopt(argc, argv, "dfiPRr")) != -1)
switch(ch) {
@@ -124,7 +121,7 @@ main(int argc, char *argv[])
rm_file(argv);
}
- exit(eval);
+ return (eval);
}
void