bother. unrevert my fix.

diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c
index f5ac500fafb42e6f5f05a502a5af558fb6a30b9f..e6b5fc99550c8b2fad6729b20949ebcb5f6a3f97 100644 (file)
--- a/libbb/process_escape_sequence.c
+++ b/libbb/process_escape_sequence.c
@@ -22,35 +22,42 @@
  *
  */
 
+#include <string.h>
 #include <stdio.h>
 #include <limits.h>
+#include <ctype.h>
 #include "libbb.h"
 
+#define isodigit(c) ((c) >= '0' && (c) <= '7')
+#define hextobin(c) ((c)>='a'&&(c)<='f' ? (c)-'a'+10 : (c)>='A'&&(c)<='F' ? (c)-'A'+10 : (c)-'0')
+#define octtobin(c) ((c) - '0')
 char bb_process_escape_sequence(const char **ptr)
 {
+       const char *p, *q;
+       unsigned int num_digits, r, n, hexescape;
        static const char charmap[] = {
                'a',  'b',  'f',  'n',  'r',  't',  'v',  '\\', 0,
                '\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\\' };
 
-       const char *p;
-       const char *q;
-       unsigned int num_digits;
-       unsigned int r;
-       unsigned int n;
-
-       n = 0;
+       n = r = hexescape = num_digits = 0;
        q = *ptr;
 
-       num_digits = 0;
+       if (*q == 'x') {
+               hexescape++;
+               ++q;
+       }
+
        do {
-               if (((unsigned int)(*q - '0')) <= 7) {
-                       r = n * 8 + (*q - '0');
-                       if (r <= UCHAR_MAX) {
-                               n = r;
-                               ++q;
-                               if (++num_digits < 3) {
-                                       continue;
-                               }
+               if (hexescape && isxdigit(*q)) {
+                       r = n * 16 + hextobin(*q);
+               } else if (isodigit(*q)) {
+                       r = n * 8 + octtobin(*q);
+               }
+               if (r <= UCHAR_MAX) {
+                       n = r;
+                       ++q;
+                       if (++num_digits < 3) {
+                               continue;
                        }
                }
                break;

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 276ca5f22426b17c5f99545754532d0fc51d8ff2..ff6e58acd48c00474cd8b516b7c81e780e3b062a 100644 (file)
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -565,7 +565,7 @@ static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
        int result = 0;
        if (execable("/sbin/udhcpc")) {
                execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
-               execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
+               execute("kill -9 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
        } else if (execable("/sbin/pump")) {
                result = execute("pump -i %iface% -k", ifd, exec);
        } else if (execable("/sbin/dhclient")) {
@@ -573,6 +573,7 @@ static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
        } else if (execable("/sbin/dhcpcd")) {
                result = execute("dhcpcd -k %iface%", ifd, exec);
        }
+       static_down(ifd, exec)
        return (result || bootp_down(ifd, exec));
 }