aboutsummaryrefslogtreecommitdiff
path: root/utility.c
diff options
context:
space:
mode:
Diffstat (limited to 'utility.c')
-rw-r--r--utility.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/utility.c b/utility.c
index 7ff0418c5..311926938 100644
--- a/utility.c
+++ b/utility.c
@@ -105,6 +105,7 @@ extern void error_msg(const char *s, ...)
105 va_start(p, s); 105 va_start(p, s);
106 verror_msg(s, p); 106 verror_msg(s, p);
107 va_end(p); 107 va_end(p);
108 putc('\n', stderr);
108} 109}
109 110
110extern void error_msg_and_die(const char *s, ...) 111extern void error_msg_and_die(const char *s, ...)
@@ -114,6 +115,7 @@ extern void error_msg_and_die(const char *s, ...)
114 va_start(p, s); 115 va_start(p, s);
115 verror_msg(s, p); 116 verror_msg(s, p);
116 va_end(p); 117 va_end(p);
118 putc('\n', stderr);
117 exit(EXIT_FAILURE); 119 exit(EXIT_FAILURE);
118} 120}
119 121
@@ -361,7 +363,7 @@ copy_file(const char *srcName, const char *destName,
361 363
362 if ((srcStatBuf.st_dev == dstStatBuf.st_dev) && 364 if ((srcStatBuf.st_dev == dstStatBuf.st_dev) &&
363 (srcStatBuf.st_ino == dstStatBuf.st_ino)) { 365 (srcStatBuf.st_ino == dstStatBuf.st_ino)) {
364 error_msg("Copying file \"%s\" to itself\n", srcName); 366 error_msg("Copying file \"%s\" to itself", srcName);
365 return FALSE; 367 return FALSE;
366 } 368 }
367 369
@@ -921,11 +923,11 @@ long my_getpwnamegid(char *name)
921 923
922 myuser=getpwnam(name); 924 myuser=getpwnam(name);
923 if (myuser==NULL) 925 if (myuser==NULL)
924 error_msg_and_die( "unknown user name: %s\n", name); 926 error_msg_and_die( "unknown user name: %s", name);
925 927
926 mygroup = getgrgid(myuser->pw_gid); 928 mygroup = getgrgid(myuser->pw_gid);
927 if (mygroup==NULL) 929 if (mygroup==NULL)
928 error_msg_and_die( "unknown gid %ld\n", (long)myuser->pw_gid); 930 error_msg_and_die( "unknown gid %ld", (long)myuser->pw_gid);
929 931
930 return mygroup->gr_gid; 932 return mygroup->gr_gid;
931} 933}
@@ -1015,7 +1017,7 @@ int get_console_fd(char *tty_name)
1015 if (is_a_console(fd)) 1017 if (is_a_console(fd))
1016 return fd; 1018 return fd;
1017 1019
1018 error_msg("Couldnt get a file descriptor referring to the console\n"); 1020 error_msg("Couldnt get a file descriptor referring to the console");
1019 return -1; /* total failure */ 1021 return -1; /* total failure */
1020} 1022}
1021 1023
@@ -1374,7 +1376,7 @@ extern char * xstrndup (const char *s, int n) {
1374 char *t; 1376 char *t;
1375 1377
1376 if (s == NULL) 1378 if (s == NULL)
1377 error_msg_and_die("xstrndup bug\n"); 1379 error_msg_and_die("xstrndup bug");
1378 1380
1379 t = xmalloc(n+1); 1381 t = xmalloc(n+1);
1380 strncpy(t,s,n); 1382 strncpy(t,s,n);
@@ -1495,13 +1497,13 @@ extern int find_real_root_device_name(char* name)
1495 char fileName[BUFSIZ]; 1497 char fileName[BUFSIZ];
1496 1498
1497 if (stat("/", &rootStat) != 0) { 1499 if (stat("/", &rootStat) != 0) {
1498 error_msg("could not stat '/'\n"); 1500 error_msg("could not stat '/'");
1499 return( FALSE); 1501 return( FALSE);
1500 } 1502 }
1501 1503
1502 dir = opendir("/dev"); 1504 dir = opendir("/dev");
1503 if (!dir) { 1505 if (!dir) {
1504 error_msg("could not open '/dev'\n"); 1506 error_msg("could not open '/dev'");
1505 return( FALSE); 1507 return( FALSE);
1506 } 1508 }
1507 1509
@@ -1660,7 +1662,7 @@ void xregcomp(regex_t *preg, const char *regex, int cflags)
1660 int errmsgsz = regerror(ret, preg, NULL, 0); 1662 int errmsgsz = regerror(ret, preg, NULL, 0);
1661 char *errmsg = xmalloc(errmsgsz); 1663 char *errmsg = xmalloc(errmsgsz);
1662 regerror(ret, preg, errmsg, errmsgsz); 1664 regerror(ret, preg, errmsg, errmsgsz);
1663 error_msg_and_die("xregcomp: %s\n", errmsg); 1665 error_msg_and_die("xregcomp: %s", errmsg);
1664 } 1666 }
1665} 1667}
1666#endif 1668#endif
@@ -1707,7 +1709,7 @@ unsigned long parse_number(const char *numstr, struct suffix_mult *suffixes)
1707 1709
1708 ret = strtoul(numstr, &end, 10); 1710 ret = strtoul(numstr, &end, 10);
1709 if (numstr == end) 1711 if (numstr == end)
1710 error_msg_and_die("invalid number `%s'\n", numstr); 1712 error_msg_and_die("invalid number `%s'", numstr);
1711 while (end[0] != '\0') { 1713 while (end[0] != '\0') {
1712 for (sm = suffixes; sm->suffix != NULL; sm++) { 1714 for (sm = suffixes; sm->suffix != NULL; sm++) {
1713 len = strlen(sm->suffix); 1715 len = strlen(sm->suffix);
@@ -1718,7 +1720,7 @@ unsigned long parse_number(const char *numstr, struct suffix_mult *suffixes)
1718 } 1720 }
1719 } 1721 }
1720 if (sm->suffix == NULL) 1722 if (sm->suffix == NULL)
1721 error_msg_and_die("invalid number `%s'\n", numstr); 1723 error_msg_and_die("invalid number `%s'", numstr);
1722 } 1724 }
1723 return ret; 1725 return ret;
1724} 1726}