adjust formatting

1 files changed, 114 insertions, 108 deletions

diff --git a/split.c b/split.c
index 54ba109..37abf09 100644
--- a/split.c
+++ b/split.c
@@ -17,125 +17,131 @@
  *
  */
 
+#define _POSIX_C_SOURCE 2
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-const char *split_desc = "split files into pieces";
-const char *split_inv  = "split [-l line_count] [-a suffix_length] [file[name]]\nsplit -b n[k|m] [-a suffix_length] [file[name]]";
+#define K_BYTES	1024
+#define M_BYTES 1048576
 
-static unsigned long power (int base, int power)
+static unsigned long power(int base, int power)
 {
-  unsigned long r = base;
-  if (power < 1)
-    return 1;
-  for (r = base; power > 1; power--)
-    r *= r;
-  return r;
+	unsigned long r = base;
+	if (power < 1)
+		return 1;
+	for (r = base; power > 1; power--)
+		r *= r;
+	return r;
 }
 
-static int split (const char *in, const char *base, int suffix, unsigned int lines, unsigned long bytes)
+static int
+split(const char *in, const char *base, int suffix, unsigned int lines, unsigned long bytes)
 {
-  FILE *f = stdin;
-  FILE *o = NULL;
-  char oname[FILENAME_MAX];
-  int chunk = 0;
-  int i;
-  char *buf;
-  size_t len;
-  size_t nread;
-
-  if (strcmp ("-", in))
-    f = fopen (in, "r");
-
-  if (bytes > 0)
-    buf = malloc (bytes);
-  else
-    buf = malloc (BUFSIZ);
-
-  memset (oname, '\0', FILENAME_MAX);
-  strcpy (oname, base);
-
-  while (!feof (f)) {
-    if (chunk >= power(26, suffix))
-      return 2; // to much data
-
-    for (i = suffix; i > 0; i--)
-      oname[strlen(base) + suffix - i] = ((chunk % power(26,i)) / power(26,i-1)) + 'a';
-    o = fopen (oname, "w");
-
-    if (lines > 0) {
-      for (i = lines; !feof(f) && i > 0; i--) {
-        if ((nread = getline (&buf, &len, f)) != -1)
-          fwrite (buf, sizeof(char), nread, o);
-      }
-    } else {
-      if ((nread = fread (buf, sizeof(char), bytes, f)) != -1)
-        fwrite (buf, sizeof(char), nread, o);
-    }
-
-    fclose (o);
-    chunk++;
-  }
-
-  if (strcmp ("-", in))
-    fclose (f);
+	FILE *f = stdin;
+	FILE *o = NULL;
+	char oname[FILENAME_MAX];
+	int chunk = 0;
+	int i;
+	char *buf;
+	size_t len;
+	size_t nread;
+
+	if (strcmp("-", in))
+		f = fopen(in, "r");
+
+	if (bytes > 0)
+		buf = malloc(bytes);
+	else
+		buf = malloc(BUFSIZ);
+
+	memset(oname, '\0', FILENAME_MAX);
+	strcpy(oname, base);
+
+	while (!feof(f)) {
+		if (chunk >= power(26, suffix))
+			return 2;	// to much data
+
+		for (i = suffix; i > 0; i--)
+			oname[strlen(base) + suffix - i] =
+			    ((chunk % power(26, i)) / power(26, i - 1)) + 'a';
+		o = fopen(oname, "w");
+
+		if (lines > 0) {
+			for (i = lines; !feof(f) && i > 0; i--) {
+				if ((nread = getline(&buf, &len, f)) != -1)
+					fwrite(buf, sizeof(char), nread, o);
+			}
+		} else {
+			if ((nread = fread(buf, sizeof(char), bytes, f)) != -1)
+				fwrite(buf, sizeof(char), nread, o);
+		}
+
+		fclose(o);
+		chunk++;
+	}
+
+	if (strcmp("-", in))
+		fclose(f);
 }
 
-int
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
-  int c;
-  unsigned int lines = 0;
-  unsigned long bytes = 0;
-  int suffix = 2;
-  char *end;
-
-  while ((c = getopt (argc, argv, ":l:a:b:")) != -1) {
-    switch (c) {
-      case 'l':
-        if (bytes != 0)
-          return 1;
-        lines = strtol (optarg, &end, 10);
-        if (end != NULL && strlen (end) > 0)
-          return 1;
-        break;
-      case 'a':
-        suffix = strtol (optarg, &end, 10);
-        if (end != NULL && strlen (end) > 0)
-          return 1;
-        break;
-      case 'b':
-        if (lines != 0)
-          return 1;
-        bytes = strtol (optarg, &end, 10);
-        if (end != NULL) {
-          if (!strcmp ("k", end))
-            bytes *= 1024;
-          else if (!strcmp ("m", end))
-            bytes *= 1048576;
-	  else
-            return 1;
-        }
-        break;
-      default:
-        return 1;
-    }
-  }
-
-  if (lines == 0 && bytes == 0)
-    lines = 1000;
-  
-  if (optind >= argc)
-    split ("-", "x", suffix, lines, bytes);
-  else if (optind == argc - 1)
-    split (argv[optind], "x", suffix, lines, bytes);
-  else if (optind == argc - 2)
-    split (argv[optind], argv[optind+1], suffix, lines, bytes);
-  else
-    return 1;
-
-  return 0;
+	int c;
+	unsigned int lines = 0;
+	unsigned long bytes = 0;
+	int suffix = 2;
+	char *end;
+
+	while ((c = getopt(argc, argv, "l:a:b:")) != -1) {
+		switch (c) {
+		case 'l':
+			bytes = 0;
+			lines = strtol(optarg, &end, 10);
+			if (end != NULL && strlen(end) > 0) {
+				return 1;
+			}
+			break;
+
+		case 'a':
+			suffix = strtol(optarg, &end, 10);
+			if (end != NULL && strlen(end) > 0)
+				return 1;
+			break;
+
+		case 'b':
+			lines = 0;
+			bytes = strtol(optarg, &end, 10);
+			if (end != NULL) {
+				if (!strcmp("k", end)) {
+					bytes *= K_BYTES;
+				} else if (!strcmp("m", end)) {
+					bytes *= M_BYTES;
+				} else {
+					return 1;
+				}
+			}
+			break;
+
+		default:
+			return 1;
+		}
+	}
+
+	if (lines == 0 && bytes == 0) {
+		lines = 1000;
+	}
+
+	if (optind >= argc) {
+		split("-", "x", suffix, lines, bytes);
+	} else if (optind == argc - 1) {
+		split(argv[optind], "x", suffix, lines, bytes);
+	} else if (optind == argc - 2) {
+		split(argv[optind], argv[optind + 1], suffix, lines, bytes);
+	} else {
+		return 1;
+	}
+
+	return 0;
 }
-