[PATCH] libbb: remove vdprintf

[Ron Yorston]

Two reasons:

* it's only built for GNU C Library versions < 2 (released 1997)

* it isn't used anywhere in BusyBox

Signed-off-by: Ron Yorston 
---
 TODO |  2 --
 include/libbb.h  |  3 ---
 libbb/Kbuild.src |  1 -
 libbb/vdprintf.c | 21 -
 4 files changed, 27 deletions(-)
 delete mode 100644 libbb/vdprintf.c

diff --git a/TODO b/TODO
index 8904b2135..72ae0f88d 100644
--- a/TODO
+++ b/TODO
@@ -224,8 +224,6 @@ Minor stuff:
 ---
   support start-stop-daemon -d 
 ---
-vdprintf() -> similar sized functionality

 
 (TODO list after discussion 11.05.2009)
 
diff --git a/include/libbb.h b/include/libbb.h
index 6abf88218..9aba71949 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -167,9 +167,6 @@
 /* Some libc's forget to declare these, do it ourself */
 
 extern char **environ;
-#if defined(__GLIBC__) && __GLIBC__ < 2
-int vdprintf(int d, const char *format, va_list ap);
-#endif
 /* klogctl is in libc's klog.h, but we cheat and not #include that */
 int klogctl(int type, char *b, int len);
 #ifndef PATH_MAX
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 49493c501..458973f17 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -97,7 +97,6 @@ lib-y += time.o
 lib-y += trim.o
 lib-y += u_signal_names.o
 lib-y += uuencode.o
-lib-y += vdprintf.o
 lib-y += verror_msg.o
 lib-y += vfork_daemon_rexec.o
 lib-y += warn_ignoring_args.o
diff --git a/libbb/vdprintf.c b/libbb/vdprintf.c
deleted file mode 100644
index 05426873e..0
--- a/libbb/vdprintf.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) 1999-2004 by Erik Andersen 
- *
- * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- */
-
-#include "libbb.h"
-
-#if defined(__GLIBC__) && __GLIBC__ < 2
-int FAST_FUNC vdprintf(int d, const char *format, va_list ap)
-{
-   char buf[8 * 1024];
-   int len;
-
-   len = vsnprintf(buf, sizeof(buf), format, ap);
-   return write(d, buf, len);
-}
-#endif
-- 
2.13.3

___
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox

Re: [PATCH] libbb: remove vdprintf

[Kang-Che Sung]

On Sat, Jul 29, 2017 at 9:48 PM, Ron Yorston  wrote:

> -#if defined(__GLIBC__) && __GLIBC__ < 2
> -int vdprintf(int d, const char *format, va_list ap);
> -#endif

__GLIBC__ is NOT defined in glibc before version 2.
So this macro check actually means a libc which claims to be
compatible with glibc but not glibc 2.
___
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox

Re: [PATCH] libbb: remove vdprintf

[Denys Vlasenko]

Applied, thanks!

On Sat, Jul 29, 2017 at 3:48 PM, Ron Yorston  wrote:
> Two reasons:
>
> * it's only built for GNU C Library versions < 2 (released 1997)
>
> * it isn't used anywhere in BusyBox
>
> Signed-off-by: Ron Yorston 
> ---
>  TODO |  2 --
>  include/libbb.h  |  3 ---
>  libbb/Kbuild.src |  1 -
>  libbb/vdprintf.c | 21 -
>  4 files changed, 27 deletions(-)
>  delete mode 100644 libbb/vdprintf.c
>
> diff --git a/TODO b/TODO
> index 8904b2135..72ae0f88d 100644
> --- a/TODO
> +++ b/TODO
> @@ -224,8 +224,6 @@ Minor stuff:
>  ---
>support start-stop-daemon -d 
>  ---
> -vdprintf() -> similar sized functionality
> 
>
>  (TODO list after discussion 11.05.2009)
>
> diff --git a/include/libbb.h b/include/libbb.h
> index 6abf88218..9aba71949 100644
> --- a/include/libbb.h
> +++ b/include/libbb.h
> @@ -167,9 +167,6 @@
>  /* Some libc's forget to declare these, do it ourself */
>
>  extern char **environ;
> -#if defined(__GLIBC__) && __GLIBC__ < 2
> -int vdprintf(int d, const char *format, va_list ap);
> -#endif
>  /* klogctl is in libc's klog.h, but we cheat and not #include that */
>  int klogctl(int type, char *b, int len);
>  #ifndef PATH_MAX
> diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
> index 49493c501..458973f17 100644
> --- a/libbb/Kbuild.src
> +++ b/libbb/Kbuild.src
> @@ -97,7 +97,6 @@ lib-y += time.o
>  lib-y += trim.o
>  lib-y += u_signal_names.o
>  lib-y += uuencode.o
> -lib-y += vdprintf.o
>  lib-y += verror_msg.o
>  lib-y += vfork_daemon_rexec.o
>  lib-y += warn_ignoring_args.o
> diff --git a/libbb/vdprintf.c b/libbb/vdprintf.c
> deleted file mode 100644
> index 05426873e..0
> --- a/libbb/vdprintf.c
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -/* vi: set sw=4 ts=4: */
> -/*
> - * Utility routines.
> - *
> - * Copyright (C) 1999-2004 by Erik Andersen 
> - *
> - * Licensed under GPLv2 or later, see file LICENSE in this source tree.
> - */
> -
> -#include "libbb.h"
> -
> -#if defined(__GLIBC__) && __GLIBC__ < 2
> -int FAST_FUNC vdprintf(int d, const char *format, va_list ap)
> -{
> -   char buf[8 * 1024];
> -   int len;
> -
> -   len = vsnprintf(buf, sizeof(buf), format, ap);
> -   return write(d, buf, len);
> -}
> -#endif
> --
> 2.13.3
>
> ___
> busybox mailing list
> busybox@busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox
___
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox