From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 9 Oct 2010 17:59:49 +0000 (+0200)
Subject: column: error messaging & exit codes
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf90b8a6affd24b850b196b9424b8364cfd1cf4c;p=util-linux

column: error messaging & exit codes

Human understandable error messages along with symbolic exit
codes to comply with coding standard.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/text-utils/column.c b/text-utils/column.c
index c8c40664..57436b06 100644
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -159,7 +159,7 @@ main(int argc, char **argv)
 			(void)fclose(fp);
 		} else {
 			warn("%s", *argv);
-			eval = 1;
+			eval = EXIT_FAILURE;
 		}
 
 	if (!entries)
@@ -174,7 +174,7 @@ main(int argc, char **argv)
 	else
 		r_columnate();
 	if (ferror(stdout) || fclose(stdout))
-		eval = 1;
+		eval = EXIT_FAILURE;
 	exit(eval);
 }
 
@@ -280,7 +280,7 @@ maketbl()
 					       * sizeof(wchar_t *))) ||
 			!(lens = realloc(lens, ((u_int)maxcols + DEFCOLS)
 					       * sizeof(int))))
-			err(1, NULL);
+			err(EXIT_FAILURE, _("out of memory?"));
 		    memset((char *)lens + maxcols * sizeof(int),
 			   0, DEFCOLS * sizeof(int));
 		    maxcols += DEFCOLS;
@@ -313,7 +313,7 @@ input(fp)
 	FILE *fp;
 {
 	static int maxentry;
-	int len;
+	int len, lineno = 1, reportedline = 0;
 	wchar_t *p, buf[MAXLINELEN];
 
 	if (!list)
@@ -323,10 +323,14 @@ input(fp)
 		if (!*p)
 			continue;
 		if (!(p = wcschr(p, '\n')) && !feof(fp)) {
-			warnx(_("line too long"));
-			eval = 1;
+			if (reportedline < lineno) {
+				warnx(_("line %d is too long, output will be truncated"), lineno);
+				reportedline = lineno;
+			}
+			eval = EXIT_FAILURE;
 			continue;
 		}
+		lineno++;
 		if (!feof(fp))
 			*p = '\0';
 		len = wcs_width(buf);	/* len = p - buf; */
@@ -336,7 +340,7 @@ input(fp)
 			maxentry += DEFNUM;
 			if (!(list = realloc(list,
 			    (u_int)maxentry * sizeof(wchar_t *))))
-				err(1, NULL);
+				err(EXIT_FAILURE, _("out of memory?"));
 		}
 		list[entries++] = wcsdup(buf);
 	}
@@ -391,7 +395,7 @@ emalloc(size)
 	char *p;
 
 	if (!(p = malloc(size)))
-		err(1, NULL);
+		err(EXIT_FAILURE, _("out of memory?"));
 	memset(p, 0, size);
 	return (p);
 }