sbase

commit 9694305e05c1de0d0f0c903d6fbd6d9c52c78aa5
parent b257f7a05f24d218ab37aa43d22e0d19a88bd33b
Author: sin <sin@2f30.org>
Date:   Mon,  5 May 2014 15:07:55 +0100

Chop one level of indentation

eprintf() will exit the program, no need to use the else construct.

Diffstat:
M
util/cp.c
 | 
49
+++++++++++++++++++++++++------------------------

1 file changed, 25 insertions(+), 24 deletions(-)
diff --git a/util/cp.c b/util/cp.c
@@ -28,36 +28,37 @@ cp(const char *s1, const char *s2)
 	if (stat(s1, &st) == 0 && S_ISDIR(st.st_mode)) {
 		if (!cp_rflag) {
 			eprintf("%s: is a directory\n", s1);
-		} else {
-			if(!(dp = opendir(s1)))
-				eprintf("opendir %s:", s1);
+		}
 
-			if (mkdir(s2, st.st_mode) == -1 && errno != EEXIST)
-				eprintf("mkdir %s:", s2);
+		if(!(dp = opendir(s1)))
+			eprintf("opendir %s:", s1);
 
-			apathmax(&ns1, &size1);
-			apathmax(&ns2, &size2);
-			while((d = readdir(dp))) {
-				if(strcmp(d->d_name, ".")
-						&& strcmp(d->d_name, "..")) {
-					if(snprintf(ns1, size1, "%s/%s", s1,
-							d->d_name) >= size1) {
-						eprintf("%s/%s: filename too long\n",
-								s1, d->d_name);
-					}
+		if (mkdir(s2, st.st_mode) == -1 && errno != EEXIST)
+			eprintf("mkdir %s:", s2);
 
-					if(snprintf(ns2, size2, "%s/%s", s2,
-							d->d_name) >= size2) {
-						eprintf("%s/%s: filename too long\n",
-								s2, d->d_name);
-					}
-					fnck(ns1, ns2, cp);
+		apathmax(&ns1, &size1);
+		apathmax(&ns2, &size2);
+		while((d = readdir(dp))) {
+			if(strcmp(d->d_name, ".")
+			   && strcmp(d->d_name, "..")) {
+				if(snprintf(ns1, size1, "%s/%s", s1,
+					    d->d_name) >= size1) {
+					eprintf("%s/%s: filename too long\n",
+						s1, d->d_name);
 				}
+
+				if(snprintf(ns2, size2, "%s/%s", s2,
+					    d->d_name) >= size2) {
+					eprintf("%s/%s: filename too long\n",
+						s2, d->d_name);
+				}
+				fnck(ns1, ns2, cp);
 			}
-			closedir(dp);
-			free(ns1);
-			free(ns2);
 		}
+
+		closedir(dp);
+		free(ns1);
+		free(ns2);
 		return 0;
 	}
 	if(!(f1 = fopen(s1, "r")))