X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftabs.c;h=bded0b04b259812db51be662d6305ac4a7dbc00c;hp=2f6915de9c468b9e20a021681d8d212fbd74997e;hb=98d8891f42d8acac5c2ade39d163f386057a22e4;hpb=c120fddebe9e9c1e2b29dbd744a6b1d03652bf8b

diff --git a/progs/tabs.c b/progs/tabs.c
index 2f6915de..bded0b04 100644
--- a/progs/tabs.c
+++ b/progs/tabs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2008-2010,2011 Free Software Foundation, Inc.              *
+ * Copyright (c) 2008-2011,2012 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -37,12 +37,19 @@
 #define USE_LIBTINFO
 #include <progs.priv.h>
 
-MODULE_ID("$Id: tabs.c,v 1.21 2011/05/21 18:31:21 tom Exp $")
+MODULE_ID("$Id: tabs.c,v 1.25 2012/11/18 01:21:47 tom Exp $")
 
 static void usage(void) GCC_NORETURN;
 
 static int max_cols;
 
+static void
+failed(const char *s)
+{
+    perror(s);
+    ExitProgram(EXIT_FAILURE);
+}
+
 static int
 putch(int c)
 {
@@ -83,28 +90,29 @@ decode_tabs(const char *tab_list)
     int prior = 0;
     int ch;
 
-    if (result != 0) {
-	while ((ch = *tab_list++) != '\0') {
-	    if (isdigit(UChar(ch))) {
-		value *= 10;
-		value += (ch - '0');
-	    } else if (ch == ',') {
-		result[n] = value + prior;
-		if (n > 0 && result[n] <= result[n - 1]) {
-		    fprintf(stderr,
-			    "tab-stops are not in increasing order: %d %d\n",
-			    value, result[n - 1]);
-		    free(result);
-		    result = 0;
-		    break;
-		}
-		++n;
-		value = 0;
-		prior = 0;
-	    } else if (ch == '+') {
-		if (n)
-		    prior = result[n - 1];
+    if (result == 0)
+	failed("decode_tabs");
+
+    while ((ch = *tab_list++) != '\0') {
+	if (isdigit(UChar(ch))) {
+	    value *= 10;
+	    value += (ch - '0');
+	} else if (ch == ',') {
+	    result[n] = value + prior;
+	    if (n > 0 && result[n] <= result[n - 1]) {
+		fprintf(stderr,
+			"tab-stops are not in increasing order: %d %d\n",
+			value, result[n - 1]);
+		free(result);
+		result = 0;
+		break;
 	    }
+	    ++n;
+	    value = 0;
+	    prior = 0;
+	} else if (ch == '+') {
+	    if (n)
+		prior = result[n - 1];
 	}
     }
 
@@ -126,6 +134,7 @@ decode_tabs(const char *tab_list)
 	result[n++] = value + prior;
 	result[n] = 0;
     }
+
     return result;
 }
 
@@ -140,10 +149,11 @@ print_ruler(int *tab_list)
     for (n = 0; n < max_cols; n += 10) {
 	int ch = 1 + (n / 10);
 	char buffer[20];
-	sprintf(buffer, "----+----%c",
-		((ch < 10)
-		 ? (ch + '0')
-		 : (ch + 'A' - 10)));
+	_nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+		    "----+----%c",
+		    ((ch < 10)
+		     ? (ch + '0')
+		     : (ch + 'A' - 10)));
 	printf("%.*s", ((max_cols - n) > 10) ? 10 : (max_cols - n), buffer);
     }
     putchar('\n');
@@ -263,15 +273,16 @@ add_to_tab_list(char **append, const char *value)
 	    need += strlen(*append);
 
 	result = malloc(need);
-	if (result != 0) {
-	    *result = '\0';
-	    if (*append != 0) {
-		strcpy(result, *append);
-		free(*append);
-	    }
-	    strcat(result, comma);
-	    strcat(result, copied);
+	if (result == 0)
+	    failed("add_to_tab_list");
+
+	*result = '\0';
+	if (*append != 0) {
+	    _nc_STRCPY(result, *append, need);
+	    free(*append);
 	}
+	_nc_STRCAT(result, comma, need);
+	_nc_STRCAT(result, copied, need);
 
 	*append = result;
     }