With nightmares of libbb ending up with 100 .c files starting

with "bb_" it seems best to rename this now and avoid starting
an evil KDE style naming trend.

diff --git a/libbb/Makefile.in b/libbb/Makefile.in
index 09c629ecafa4c7c7b34cd9450aecd879e3b53662..6d2475bcfe9de8a5b14f336fd6794766d41a9c17 100644 (file)
--- a/libbb/Makefile.in
+++ b/libbb/Makefile.in
@@ -43,7 +43,7 @@ LIBBB_SRC:= \
        setup_environment.c simplify_path.c syscalls.c syslog_msg_with_name.c \
        time_string.c trim.c u_signal_names.c vdprintf.c verror_msg.c \
        vherror_msg.c vperror_msg.c wfopen.c xconnect.c xgetcwd.c xfuncs.c \
-       xgethostbyname.c xgethostbyname2.c xreadlink.c xregcomp.c bb_xgetlarg.c 
+       xgethostbyname.c xgethostbyname2.c xreadlink.c xregcomp.c xgetlarg.c 
        
 
 LIBBB_OBJS=$(patsubst %.c,$(LIBBB_DIR)%.o, $(LIBBB_SRC))

diff --git a/libbb/bb_xgetlarg.c b/libbb/bb_xgetlarg.c
deleted file mode 100644 (file)
index 598b0b3..0000000
--- a/libbb/bb_xgetlarg.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Copyright (C) 2003 Erik Andersen <andersee@debian.org>
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "busybox.h"
-
-extern long bb_xgetlarg(char *arg, int base, long lower, long upper)
-{
-       long result;
-       char *endptr;
-       int errno_save = errno;
-
-       assert(arg!=NULL);
-       errno = 0;
-       result = strtol(arg, &endptr, base);
-       if (errno != 0 || *endptr!='\0' || result < lower || result > upper)
-               show_usage();
-       errno = errno_save;
-       return result;
-}

diff --git a/libbb/xgetlarg.c b/libbb/xgetlarg.c
new file mode 100644 (file)
index 0000000..598b0b3
--- /dev/null
+++ b/libbb/xgetlarg.c
@@ -0,0 +1,28 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2003 Erik Andersen <andersee@debian.org>
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <errno.h>
+#include <assert.h>
+
+#include "busybox.h"
+
+extern long bb_xgetlarg(char *arg, int base, long lower, long upper)
+{
+       long result;
+       char *endptr;
+       int errno_save = errno;
+
+       assert(arg!=NULL);
+       errno = 0;
+       result = strtol(arg, &endptr, base);
+       if (errno != 0 || *endptr!='\0' || result < lower || result > upper)
+               show_usage();
+       errno = errno_save;
+       return result;
+}