chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: move string copy functions to shared/
[elogind.git]
/
src
/
udev
/
scsi_id
/
scsi_id.c
diff --git
a/src/udev/scsi_id/scsi_id.c
b/src/udev/scsi_id/scsi_id.c
index b1e089cb7c63ce3c276a19c75b81be391165988d..fa0413c462fbdde5bdea0e8f2d705224317c7fe3 100644
(file)
--- a/
src/udev/scsi_id/scsi_id.c
+++ b/
src/udev/scsi_id/scsi_id.c
@@
-53,7
+53,7
@@
static const char dev_short_options[] = "bgp:";
static int all_good;
static int dev_specified;
static int all_good;
static int dev_specified;
-static char config_file[MAX_PATH_LEN] =
SYSCONFDIR "
/scsi_id.config";
+static char config_file[MAX_PATH_LEN] =
"/etc
/scsi_id.config";
static enum page_code default_page_code;
static int sg_version = 4;
static int use_stderr;
static enum page_code default_page_code;
static int sg_version = 4;
static int use_stderr;
@@
-108,7
+108,7
@@
static void set_type(const char *from, char *to, size_t len)
break;
}
}
break;
}
}
-
util_
strscpy(to, len, type);
+ strscpy(to, len, type);
}
/*
}
/*
@@
-341,7
+341,7
@@
static int set_options(struct udev *udev,
case 'd':
dev_specified = 1;
case 'd':
dev_specified = 1;
-
util_
strscpy(maj_min_dev, MAX_PATH_LEN, optarg);
+ strscpy(maj_min_dev, MAX_PATH_LEN, optarg);
break;
case 'e':
break;
case 'e':
@@
-349,7
+349,7
@@
static int set_options(struct udev *udev,
break;
case 'f':
break;
case 'f':
-
util_
strscpy(config_file, MAX_PATH_LEN, optarg);
+ strscpy(config_file, MAX_PATH_LEN, optarg);
break;
case 'g':
break;
case 'g':
@@
-415,7
+415,7
@@
static int set_options(struct udev *udev,
}
if (optind < argc && !dev_specified) {
dev_specified = 1;
}
if (optind < argc && !dev_specified) {
dev_specified = 1;
-
util_
strscpy(maj_min_dev, MAX_PATH_LEN, argv[optind]);
+ strscpy(maj_min_dev, MAX_PATH_LEN, argv[optind]);
}
return 0;
}
}
return 0;
}