CVS commit: src/usr.bin/indent

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Thu Oct  7 17:38:21 UTC 2021

Modified Files:
        src/usr.bin/indent: args.c

Log Message:
indent: complain if the profile from the command line does not exist


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/usr.bin/indent/args.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/indent/args.c
diff -u src/usr.bin/indent/args.c:1.45 src/usr.bin/indent/args.c:1.46
--- src/usr.bin/indent/args.c:1.45	Thu Oct  7 17:31:33 2021
+++ src/usr.bin/indent/args.c	Thu Oct  7 17:38:21 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: args.c,v 1.45 2021/10/07 17:31:33 rillig Exp $	*/
+/*	$NetBSD: args.c,v 1.46 2021/10/07 17:38:21 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)args.c	8.1 (
 
 #include <sys/cdefs.h>
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: args.c,v 1.45 2021/10/07 17:31:33 rillig Exp $");
+__RCSID("$NetBSD: args.c,v 1.46 2021/10/07 17:38:21 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/args.c 336318 2018-07-15 21:04:21Z pstef $");
 #endif
@@ -140,12 +140,15 @@ static const struct pro {
 };
 
 static void
-load_profile(const char *fname)
+load_profile(const char *fname, bool must_exist)
 {
     FILE *f;
 
-    if ((f = fopen(fname, "r")) == NULL)
+    if ((f = fopen(fname, "r")) == NULL) {
+	if (must_exist)
+	    err(EXIT_FAILURE, "profile %s", fname);
 	return;
+    }
     option_source = fname;
 
     for (;;) {
@@ -186,12 +189,12 @@ load_profiles(const char *profile_name)
     char fname[PATH_MAX];
 
     if (profile_name != NULL)
-	load_profile(profile_name);
+	load_profile(profile_name, true);
     else {
 	snprintf(fname, sizeof(fname), "%s/.indent.pro", getenv("HOME"));
-	load_profile(fname);
+	load_profile(fname, false);
     }
-    load_profile(".indent.pro");
+    load_profile(".indent.pro", false);
     option_source = "Command line";
 }
 
@@ -267,7 +270,7 @@ set_option(const char *arg)
     const struct pro *p;
     const char *param_start;
 
-    arg++;			/* ignore leading "-" */
+    arg++;			/* skip leading '-' */
     if (set_special_option(arg))
 	return;