git: 63b6e661d25c - main - sh: reindent a for loop in parser.c

From: Piotr Pawel Stefaniak <pstef_at_FreeBSD.org>
Date: Tue, 12 Sep 2023 16:42:53 UTC
The branch main has been updated by pstef:

URL: https://cgit.FreeBSD.org/src/commit/?id=63b6e661d25c67b4ab9b7743bf1c68e3876ddc1e

commit 63b6e661d25c67b4ab9b7743bf1c68e3876ddc1e
Author:     Piotr Pawel Stefaniak <pstef@FreeBSD.org>
AuthorDate: 2023-01-01 19:22:28 +0000
Commit:     Piotr Pawel Stefaniak <pstef@FreeBSD.org>
CommitDate: 2023-09-12 16:36:32 +0000

    sh: reindent a for loop in parser.c
    
    Reduce indentation level before a commit that will add new code here.
    
    Reviewed by:    jilles
    Differential Revision:  https://reviews.freebsd.org/D37926
---
 bin/sh/parser.c | 242 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 123 insertions(+), 119 deletions(-)

diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index 044233da5d73..121c367c601c 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -2054,135 +2054,139 @@ getprompt(void *unused __unused)
 	/*
 	 * Format prompt string.
 	 */
-	for (i = 0; (i < PROMPTLEN - 1) && (*fmt != '\0'); i++, fmt++)
-		if (*fmt == '\\')
-			switch (*++fmt) {
+	for (i = 0; (i < PROMPTLEN - 1) && (*fmt != '\0'); i++, fmt++) {
+		if (*fmt != '\\') {
+			ps[i] = *fmt;
+			continue;
+		}
 
-				/*
-				 * Non-printing sequence begin and end.
-				 */
-			case '[':
-			case ']':
-				ps[i] = '\001';
-				break;
+		switch (*++fmt) {
 
-				/*
-				 * Literal \ and some ASCII characters:
-				 * \a	BEL
-				 * \e	ESC
-				 * \r	CR
-				 */
-			case '\\':
-			case 'a':
-			case 'e':
-			case 'r':
-				if (*fmt == 'a')
-					ps[i] = '\007';
-				else if (*fmt == 'e')
-					ps[i] = '\033';
-				else if (*fmt == 'r')
-					ps[i] = '\r';
-				else
-					ps[i] = '\\';
-				break;
+		/*
+		 * Non-printing sequence begin and end.
+		 */
+		case '[':
+		case ']':
+			ps[i] = '\001';
+			break;
 
-				/*
-				 * CRLF sequence
-				 */
-			case 'n':
-				if (i < PROMPTLEN - 3) {
-					ps[i++] = '\r';
-					ps[i] = '\n';
-				}
-				break;
+		/*
+		 * Literal \ and some ASCII characters:
+		 * \a	BEL
+		 * \e	ESC
+		 * \r	CR
+		 */
+		case '\\':
+		case 'a':
+		case 'e':
+		case 'r':
+			if (*fmt == 'a')
+				ps[i] = '\007';
+			else if (*fmt == 'e')
+				ps[i] = '\033';
+			else if (*fmt == 'r')
+				ps[i] = '\r';
+			else
+				ps[i] = '\\';
+			break;
 
-				/*
-				 * Hostname.
-				 *
-				 * \h specifies just the local hostname,
-				 * \H specifies fully-qualified hostname.
-				 */
-			case 'h':
-			case 'H':
-				ps[i] = '\0';
-				gethostname(&ps[i], PROMPTLEN - i - 1);
-				ps[PROMPTLEN - 1] = '\0';
-				/* Skip to end of hostname. */
-				trim = (*fmt == 'h') ? '.' : '\0';
-				while ((ps[i] != '\0') && (ps[i] != trim))
-					i++;
-				--i;
-				break;
+		/*
+		 * CRLF sequence
+		 */
+		case 'n':
+			if (i < PROMPTLEN - 3) {
+				ps[i++] = '\r';
+				ps[i] = '\n';
+			}
+			break;
 
-				/*
-				 * User name.
-				 */
-			case 'u':
-				ps[i] = '\0';
-				getusername(&ps[i], PROMPTLEN - i);
-				/* Skip to end of username. */
-				while (ps[i + 1] != '\0')
-					i++;
-				break;
+		/*
+		 * Hostname.
+		 *
+		 * \h specifies just the local hostname,
+		 * \H specifies fully-qualified hostname.
+		 */
+		case 'h':
+		case 'H':
+			ps[i] = '\0';
+			gethostname(&ps[i], PROMPTLEN - i - 1);
+			ps[PROMPTLEN - 1] = '\0';
+			/* Skip to end of hostname. */
+			trim = (*fmt == 'h') ? '.' : '\0';
+			while ((ps[i] != '\0') && (ps[i] != trim))
+				i++;
+			--i;
+			break;
 
-				/*
-				 * Working directory.
-				 *
-				 * \W specifies just the final component,
-				 * \w specifies the entire path.
-				 */
-			case 'W':
-			case 'w':
-				pwd = lookupvar("PWD");
-				if (pwd == NULL || *pwd == '\0')
-					pwd = "?";
-				if (*fmt == 'W' &&
-				    *pwd == '/' && pwd[1] != '\0')
-					strlcpy(&ps[i], strrchr(pwd, '/') + 1,
+		/*
+		 * User name.
+		 */
+		case 'u':
+			ps[i] = '\0';
+			getusername(&ps[i], PROMPTLEN - i);
+			/* Skip to end of username. */
+			while (ps[i + 1] != '\0')
+				i++;
+			break;
+
+		/*
+		 * Working directory.
+		 *
+		 * \W specifies just the final component,
+		 * \w specifies the entire path.
+		 */
+		case 'W':
+		case 'w':
+			pwd = lookupvar("PWD");
+			if (pwd == NULL || *pwd == '\0')
+				pwd = "?";
+			if (*fmt == 'W' &&
+			    *pwd == '/' && pwd[1] != '\0')
+				strlcpy(&ps[i], strrchr(pwd, '/') + 1,
+				    PROMPTLEN - i);
+			else {
+				home = lookupvar("HOME");
+				if (home != NULL)
+					homelen = strlen(home);
+				if (home != NULL &&
+				    strcmp(home, "/") != 0 &&
+				    strncmp(pwd, home, homelen) == 0 &&
+				    (pwd[homelen] == '/' ||
+				    pwd[homelen] == '\0')) {
+					strlcpy(&ps[i], "~",
 					    PROMPTLEN - i);
-				else {
-					home = lookupvar("HOME");
-					if (home != NULL)
-						homelen = strlen(home);
-					if (home != NULL &&
-					    strcmp(home, "/") != 0 &&
-					    strncmp(pwd, home, homelen) == 0 &&
-					    (pwd[homelen] == '/' ||
-					    pwd[homelen] == '\0')) {
-						strlcpy(&ps[i], "~",
-						    PROMPTLEN - i);
-						strlcpy(&ps[i + 1],
-						    pwd + homelen,
-						    PROMPTLEN - i - 1);
-					} else {
-						strlcpy(&ps[i], pwd, PROMPTLEN - i);
-					}
+					strlcpy(&ps[i + 1],
+					    pwd + homelen,
+					    PROMPTLEN - i - 1);
+				} else {
+					strlcpy(&ps[i], pwd, PROMPTLEN - i);
 				}
-				/* Skip to end of path. */
-				while (ps[i + 1] != '\0')
-					i++;
-				break;
+			}
+			/* Skip to end of path. */
+			while (ps[i + 1] != '\0')
+				i++;
+			break;
 
-				/*
-				 * Superuser status.
-				 *
-				 * '$' for normal users, '#' for root.
-				 */
-			case '$':
-				ps[i] = (geteuid() != 0) ? '$' : '#';
-				break;
+		/*
+		 * Superuser status.
+		 *
+		 * '$' for normal users, '#' for root.
+		 */
+		case '$':
+			ps[i] = (geteuid() != 0) ? '$' : '#';
+			break;
 
-				/*
-				 * Emit unrecognized formats verbatim.
-				 */
-			default:
-				ps[i] = '\\';
-				if (i < PROMPTLEN - 2)
-					ps[++i] = *fmt;
-				break;
-			}
-		else
-			ps[i] = *fmt;
+		/*
+		 * Emit unrecognized formats verbatim.
+		 */
+		default:
+			ps[i] = '\\';
+			if (i < PROMPTLEN - 2)
+				ps[++i] = *fmt;
+			break;
+		}
+
+	}
 	ps[i] = '\0';
 	return (ps);
 }