changeset 1350:bb9c601122b8

Promote strings.
author Rob Landley <rob@landley.net>
date Wed, 11 Jun 2014 08:11:38 -0500
parents bf2e5591bdf0
children 0f2b9d0b1f7a
files toys/pending/strings.c toys/posix/strings.c
diffstat 2 files changed, 67 insertions(+), 67 deletions(-) [+]
line wrap: on
line diff
--- a/toys/pending/strings.c	Wed Jun 11 08:02:55 2014 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*strings.c - print the strings of printable characters in files.
- *
- * Copyright 2014 Kyung-su Kim <kaspyx@gmail.com>
- * Copyright 2014 Kyungwan Han <asura321@gmail.com>
- *
- * No Standard
- * TODO: utf8 strings
- * TODO: posix -t
-
-USE_STRINGS(NEWTOY(strings, "an#=4<1fo", TOYFLAG_USR|TOYFLAG_BIN))
-
-config STRINGS
-  bool "strings"
-  default n
-  help
-    usage: strings [-fo] [-n LEN] [FILE...]
-
-    Display printable strings in a binary file
-
-    -f	Precede strings with filenames
-    -n	At least LEN characters form a string (default 4)
-    -o	Precede strings with decimal offsets
-*/
-
-#define FOR_strings
-#include "toys.h"
-
-GLOBALS(
-  long num;
-)
-
-void do_strings(int fd, char *filename)
-{
-  int nread, i, wlen = TT.num, count = 0;
-  off_t offset = 0;
-  char *string = xzalloc(wlen + 1);
-
-  for (;;) {
-    nread = read(fd, toybuf, sizeof(toybuf));
-    if (nread < 0) perror_msg("%s", filename);
-    if (nread < 1) break;
-    for (i = 0; i < nread; i++, offset++) {
-      if (((toybuf[i] >= 32) && (toybuf[i] <= 126)) || (toybuf[i] == '\t')) {
-        if (count == wlen) fputc(toybuf[i], stdout);
-        else {
-          string[count++] = toybuf[i];
-          if (count == wlen) {
-            if (toys.optflags & FLAG_f) printf("%s: ", filename);
-            if (toys.optflags & FLAG_o)
-              printf("%7lld ",(long long)(offset - wlen));
-            printf("%s", string);
-          }
-        }
-      } else {
-        if (count == wlen) xputc('\n');
-        count = 0;
-      }
-    }
-  }
-  xclose(fd);
-  free(string);
-}
-
-void strings_main(void)
-{
-  loopfiles(toys.optargs, do_strings);
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toys/posix/strings.c	Wed Jun 11 08:11:38 2014 -0500
@@ -0,0 +1,67 @@
+/*strings.c - print the strings of printable characters in files.
+ *
+ * Copyright 2014 Kyung-su Kim <kaspyx@gmail.com>
+ * Copyright 2014 Kyungwan Han <asura321@gmail.com>
+ *
+ * No Standard
+ * TODO: utf8 strings
+ * TODO: posix -t
+
+USE_STRINGS(NEWTOY(strings, "an#=4<1fo", TOYFLAG_USR|TOYFLAG_BIN))
+
+config STRINGS
+  bool "strings"
+  default y
+  help
+    usage: strings [-fo] [-n LEN] [FILE...]
+
+    Display printable strings in a binary file
+
+    -f	Precede strings with filenames
+    -n	At least LEN characters form a string (default 4)
+    -o	Precede strings with decimal offsets
+*/
+
+#define FOR_strings
+#include "toys.h"
+
+GLOBALS(
+  long num;
+)
+
+void do_strings(int fd, char *filename)
+{
+  int nread, i, wlen = TT.num, count = 0;
+  off_t offset = 0;
+  char *string = xzalloc(wlen + 1);
+
+  for (;;) {
+    nread = read(fd, toybuf, sizeof(toybuf));
+    if (nread < 0) perror_msg("%s", filename);
+    if (nread < 1) break;
+    for (i = 0; i < nread; i++, offset++) {
+      if (((toybuf[i] >= 32) && (toybuf[i] <= 126)) || (toybuf[i] == '\t')) {
+        if (count == wlen) fputc(toybuf[i], stdout);
+        else {
+          string[count++] = toybuf[i];
+          if (count == wlen) {
+            if (toys.optflags & FLAG_f) printf("%s: ", filename);
+            if (toys.optflags & FLAG_o)
+              printf("%7lld ",(long long)(offset - wlen));
+            printf("%s", string);
+          }
+        }
+      } else {
+        if (count == wlen) xputc('\n');
+        count = 0;
+      }
+    }
+  }
+  xclose(fd);
+  free(string);
+}
+
+void strings_main(void)
+{
+  loopfiles(toys.optargs, do_strings);
+}