Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/skip_whitespace.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/skip_whitespace.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/libbb/skip_whitespace.c

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
 
-char *skip_whitespace(const char *s)
+char* FAST_FUNC skip_whitespace(const char *s)
 {
-    /* NB: isspace('0') returns 0 */
-    while (isspace(*s)) ++s;
+    /* In POSIX/C locale (the only locale we care about: do we REALLY want
+     * to allow Unicode whitespace in, say, .conf files? nuts!)
+     * isspace is only these chars: "\t\n\v\f\r" and space.
+     * "\t\n\v\f\r" happen to have ASCII codes 9,10,11,12,13.
+     * Use that.
+     */
+    while (*s == ' ' || (unsigned char)(*s - 9) <= (13 - 9))
+        s++;
 
     return (char *) s;
 }
 
-char *skip_non_whitespace(const char *s)
+char* FAST_FUNC skip_non_whitespace(const char *s)
 {
-    while (*s && !isspace(*s)) ++s;
+    while (*s != '\0' && *s != ' ' && (unsigned char)(*s - 9) > (13 - 9))
+        s++;
 
     return (char *) s;
 }
+
+char* FAST_FUNC skip_dev_pfx(const char *tty_name)
+{
+    if (strncmp(tty_name, "/dev/", 5) == 0)
+        tty_name += 5;
+    return (char*)tty_name;
+}