X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Finstall-mh.c;h=50854f0c3b3bc68a2e76bb5a21147c192a799611;hp=ce07d5dce910f291161a2d9011b6992008b9841a;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/install-mh.c b/uip/install-mh.c
index ce07d5d..50854f0 100644
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -29,7 +29,7 @@ static char *geta(void);
 
 
 int
-main (int argc, char **argv)
+main(int argc, char **argv)
 {
 	int autof = 0;
 	char *cp, *pathname, buf[BUFSIZ];
@@ -43,28 +43,28 @@ main (int argc, char **argv)
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
 #endif
-	invo_name = r1bindex (argv[0], '/');
-	arguments = getarguments (invo_name, argc, argv, 0);
+	invo_name = r1bindex(argv[0], '/');
+	arguments = getarguments(invo_name, argc, argv, 0);
 	argp = arguments;
 
 	check = 0;
 
 	while ((dp = *argp++)) {
 		if (*dp == '-') {
-			switch (smatch (++dp, switches)) {
+			switch (smatch(++dp, switches)) {
 				case AMBIGSW:
-					ambigsw (dp, switches);
-					done (1);
+					ambigsw(dp, switches);
+					done(1);
 				case UNKWNSW:
-					adios (NULL, "-%s unknown\n", dp);
+					adios(NULL, "-%s unknown\n", dp);
 
 				case HELPSW:
-					snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
-					print_help (buf, switches, 0);
-					done (1);
+					snprintf(buf, sizeof(buf), "%s [switches]", invo_name);
+					print_help(buf, switches, 0);
+					done(1);
 				case VERSIONSW:
 					print_version(invo_name);
-					done (1);
+					done(1);
 
 				case AUTOSW:
 					autof++;
@@ -75,7 +75,7 @@ main (int argc, char **argv)
 					continue;
 			}
 		} else {
-			adios (NULL, "%s is invalid argument", dp);
+			adios(NULL, "%s is invalid argument", dp);
 		}
 	}
 
@@ -86,7 +86,8 @@ main (int argc, char **argv)
 	*/
 
 	if ((mypath = getenv("HOME")) == (char *)0) {
-		if ((pw = getpwuid(getuid())) == (struct passwd *)0 || *pw->pw_dir == '\0')
+		if ((pw = getpwuid(getuid())) == (struct passwd *)0 ||
+				*pw->pw_dir == '\0')
 			adios(NULL, "cannot determine your home directory");
 		else
 			mypath = pw->pw_dir;
@@ -112,19 +113,19 @@ main (int argc, char **argv)
 	** if it does.
 	*/
 
-	if (stat (defpath, &st) != NOTOK) {
+	if (stat(defpath, &st) != NOTOK) {
 		if (check)
 			done(0);
 
 		else if (autof)
-			adios (NULL, "invocation error");
+			adios(NULL, "invocation error");
 		else
-			adios (NULL, "You already have an nmh profile, use an editor to modify it");
+			adios(NULL, "You already have an nmh profile, use an editor to modify it");
 	} else if (check) {
 		done(1);
 	}
 
-	if (!autof && gans ("Do you want help? ", anoyes)) {
+	if (!autof && gans("Do you want help? ", anoyes)) {
 		(void)printf(
 		 "\n"
 		 "Prior to using nmh, it is necessary to have a file in your login\n"
@@ -135,12 +136,12 @@ main (int argc, char **argv)
 		 "\n", mypath, mh_profile, mypath);
 	}
 
-	cp = concat (mypath, "/", "Mail", NULL);
-	if (stat (cp, &st) != NOTOK) {
+	cp = concat(mypath, "/", "Mail", NULL);
+	if (stat(cp, &st) != NOTOK) {
 		if (S_ISDIR(st.st_mode)) {
-			cp = concat ("You already have the standard nmh directory \"",
+			cp = concat("You already have the standard nmh directory \"",
 				cp, "\".\nDo you want to use it for nmh? ", NULL);
-			if (gans (cp, anoyes))
+			if (gans(cp, anoyes))
 				pathname = "Mail";
 			else
 				goto query;
@@ -149,42 +150,42 @@ main (int argc, char **argv)
 		}
 	} else {
 		if (autof)
-			printf ("I'm going to create the standard nmh path for you.\n");
+			printf("I'm going to create the standard nmh path for you.\n");
 		else
-			cp = concat ("Do you want the standard nmh path \"",
+			cp = concat("Do you want the standard nmh path \"",
 					mypath, "/", "Mail\"? ", NULL);
-		if (autof || gans (cp, anoyes))
+		if (autof || gans(cp, anoyes))
 			pathname = "Mail";
 		else {
 query:
-			if (gans ("Do you want a path below your login directory? ",
-						anoyes)) {
-				printf ("What is the path?  %s/", mypath);
-				pathname = geta ();
+			if (gans("Do you want a path below your login directory? ", anoyes)) {
+				printf("What is the path?  %s/", mypath);
+				pathname = geta();
 			} else {
-				printf ("What is the whole path?  /");
-				pathname = concat ("/", geta (), NULL);
+				printf("What is the whole path?  /");
+				pathname = concat("/", geta(), NULL);
 			}
 		}
 	}
 
-	chdir (mypath);
-	if (chdir (pathname) == NOTOK) {
-		cp = concat ("\"", pathname, "\" doesn't exist; Create it? ", NULL);
-		if (autof || gans (cp, anoyes))
-			if (makedir (pathname) == 0)
-				adios (NULL, "unable to create %s", pathname);
+	chdir(mypath);
+	if (chdir(pathname) == NOTOK) {
+		cp = concat("\"", pathname, "\" doesn't exist; Create it? ",
+				NULL);
+		if (autof || gans(cp, anoyes))
+			if (makedir(pathname) == 0)
+				adios(NULL, "unable to create %s", pathname);
 	} else {
-		printf ("[Using existing directory]\n");
+		printf("[Using existing directory]\n");
 	}
 
 	/*
 	** Add some initial elements to the profile/context list
 	*/
-	m_defs = (struct node *) mh_xmalloc (sizeof *np);
+	m_defs = (struct node *) mh_xmalloc(sizeof *np);
 	np = m_defs;
-	np->n_name = getcpy ("Path");
-	np->n_field = getcpy (pathname);
+	np->n_name = getcpy("Path");
+	np->n_field = getcpy(pathname);
 	np->n_context = 0;
 	np->n_next = NULL;
 
@@ -192,41 +193,41 @@ query:
 	** If there is a default profile file in the
 	** nmh `etc' directory, then read it also.
 	*/
-	if ((in = fopen (mh_defaults, "r"))) {
-		readconfig (&np->n_next, in, mh_defaults, 0);
-		fclose (in);
+	if ((in = fopen(mh_defaults, "r"))) {
+		readconfig(&np->n_next, in, mh_defaults, 0);
+		fclose(in);
 	}
 
-	ctxpath = getcpy (m_maildir (context = "context"));
+	ctxpath = getcpy(m_maildir(context = "context"));
 
 	/* Initialize current folder to default */
-	context_replace (pfolder, defaultfolder);
-	context_save ();
+	context_replace(pfolder, defaultfolder);
+	context_save();
 
 	/*
 	** Now write out the initial .mh_profile
 	*/
-	if ((out = fopen (defpath, "w")) == NULL)
-		adios (defpath, "unable to write");
+	if ((out = fopen(defpath, "w")) == NULL)
+		adios(defpath, "unable to write");
 	for (np = m_defs; np; np = np->n_next) {
 		if (!np->n_context)
-			fprintf (out, "%s: %s\n", np->n_name, np->n_field);
+			fprintf(out, "%s: %s\n", np->n_name, np->n_field);
 	}
-	fclose (out);
-	done (0);
+	fclose(out);
+	done(0);
 	return 1;
 }
 
 
 static char *
-geta (void)
+geta(void)
 {
 	char *cp;
 	static char line[BUFSIZ];
 
 	fflush(stdout);
 	if (fgets(line, sizeof(line), stdin) == NULL)
-		done (1);
+		done(1);
 	if ((cp = strchr(line, '\n')))
 		*cp = 0;
 	return line;