summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b2de14b)
Pulled from Alt Linu
Conflicts:
cliserv.h
-void err_nonfatal(const char *s) {
- const int maxlen = 150;
- char s1[maxlen], *s2;
+void err(const char *s) G_GNUC_NORETURN;
+
+void err(const char *s) {
+ char s1[150], *s2;
- strncpy(s1, s, maxlen);
+ strncpy(s1, s, sizeof(s1));
if ((s2 = strstr(s, "%m"))) {
strcpy(s1 + (s2 - s), strerror(errno));
s2 += 2;
if ((s2 = strstr(s, "%m"))) {
strcpy(s1 + (s2 - s), strerror(errno));
s2 += 2;
+ s1[sizeof(s1)-1] = '\0';
#ifdef ISSERVER
syslog(LOG_ERR, "%s", s1);
syslog(LOG_ERR, "Exiting.");
#ifdef ISSERVER
syslog(LOG_ERR, "%s", s1);
syslog(LOG_ERR, "Exiting.");
#include <getopt.h>
#include <stdarg.h>
#include <getopt.h>
#include <stdarg.h>
-#ifndef __GNUC__
-#error I need GCC to work
-#endif
-
#include <linux/ioctl.h>
#define MY_NAME "nbd_client"
#include "cliserv.h"
#include <linux/ioctl.h>
#define MY_NAME "nbd_client"
#include "cliserv.h"