Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style.

The actual code should be the same afterward, this is just cosmetic refactoring.

1 files changed, 24 insertions, 26 deletions

diff --git a/toys/posix/basename.c b/toys/posix/basename.c
index 9f228b41..75f3baa4 100644
--- a/toys/posix/basename.c
+++ b/toys/posix/basename.c
@@ -1,6 +1,4 @@
-/* vi: set sw=4 ts=4:
- *
- * basename.c - Return non-directory portion of a pathname
+/* basename.c - Return non-directory portion of a pathname
  *
  * Copyright 2012 Tryn Mirell <tryn@mirell.org>
  *
@@ -10,36 +8,36 @@
 USE_BASENAME(NEWTOY(basename, "<1>2", TOYFLAG_USR|TOYFLAG_BIN))
 
 config BASENAME
-	bool "basename"
-	default y
-	help
-        usage: basename string [suffix]
+  bool "basename"
+  default y
+  help
+    usage: basename string [suffix]
 
-        Return non-directory portion of a pathname removing suffix
+    Return non-directory portion of a pathname removing suffix
 */
 
 #include "toys.h"
 
 void basename_main(void)
 {
-    char *arg = toys.optargs[0], *suffix = toys.optargs[1], *base;
-
-    while ((base = strrchr(arg, '/'))) {
-        if (base == arg) break;
-        if (!base[1]) *base = 0;
-        else {
-            base++;
-            break;
-        }
+  char *arg = toys.optargs[0], *suffix = toys.optargs[1], *base;
+
+  while ((base = strrchr(arg, '/'))) {
+    if (base == arg) break;
+    if (!base[1]) *base = 0;
+    else {
+      base++;
+      break;
     }
+  }
 
-    if (!base) base = arg;
-    
-    // chop off the suffix if provided
-    if (suffix) {
-        arg = base + strlen(base) - strlen(suffix);
-        if (arg > base && !strcmp(arg, suffix)) *arg = 0;
-    }
- 
-    puts(base);
+  if (!base) base = arg;
+
+  // chop off the suffix if provided
+  if (suffix) {
+    arg = base + strlen(base) - strlen(suffix);
+    if (arg > base && !strcmp(arg, suffix)) *arg = 0;
+  }
+
+  puts(base);
 }