Revert some uses of xsprintf
This reverts some changes introduced in d054f0a4d4
.
xsprintf should be used in cases where we calculated the right buffer
size by hand (using DECIMAL_STRING_MAX and such), and never in cases where
we are printing externally specified strings of arbitrary length.
Fixes #4534.
This commit is contained in:
parent
7fa6328cc4
commit
e68eedbbdc
|
@ -782,7 +782,7 @@ static void log_assert(
|
|||
return;
|
||||
|
||||
DISABLE_WARNING_FORMAT_NONLITERAL;
|
||||
xsprintf(buffer, format, text, file, line, func);
|
||||
snprintf(buffer, sizeof buffer, format, text, file, line, func);
|
||||
REENABLE_WARNING;
|
||||
|
||||
log_abort_msg = buffer;
|
||||
|
|
|
@ -1472,7 +1472,7 @@ static void unit_status_log_starting_stopping_reloading(Unit *u, JobType t) {
|
|||
format = unit_get_status_message_format(u, t);
|
||||
|
||||
DISABLE_WARNING_FORMAT_NONLITERAL;
|
||||
xsprintf(buf, format, unit_description(u));
|
||||
snprintf(buf, sizeof buf, format, unit_description(u));
|
||||
REENABLE_WARNING;
|
||||
|
||||
mid = t == JOB_START ? SD_MESSAGE_UNIT_STARTING :
|
||||
|
|
|
@ -85,16 +85,16 @@ static void usage(void)
|
|||
*/
|
||||
static int prepare(char *dir, char *filename)
|
||||
{
|
||||
char buf[512];
|
||||
char buf[PATH_MAX];
|
||||
int r, fd;
|
||||
|
||||
r = mkdir(dir, 0700);
|
||||
if (r < 0 && errno != EEXIST)
|
||||
return -errno;
|
||||
|
||||
xsprintf(buf, "%s/%s", dir, filename);
|
||||
snprintf(buf, sizeof buf, "%s/%s", dir, filename);
|
||||
|
||||
fd = open(buf,O_RDWR|O_CREAT|O_CLOEXEC, S_IRUSR|S_IWUSR);
|
||||
fd = open(buf, O_RDWR|O_CREAT|O_CLOEXEC, S_IRUSR|S_IWUSR);
|
||||
if (fd < 0)
|
||||
fprintf(stderr, "Cannot open %s: %m\n", buf);
|
||||
|
||||
|
|
|
@ -211,7 +211,7 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
|
|||
char *s;
|
||||
const char *attr, *port_name;
|
||||
struct udev_device *pci = NULL;
|
||||
char slots[256], str[256];
|
||||
char slots[PATH_MAX];
|
||||
_cleanup_closedir_ DIR *dir = NULL;
|
||||
struct dirent *dent;
|
||||
int hotplug_slot = 0, err = 0;
|
||||
|
@ -248,7 +248,8 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
|
|||
err = -ENOENT;
|
||||
goto out;
|
||||
}
|
||||
xsprintf(slots, "%s/slots", udev_device_get_syspath(pci));
|
||||
|
||||
snprintf(slots, sizeof slots, "%s/slots", udev_device_get_syspath(pci));
|
||||
dir = opendir(slots);
|
||||
if (!dir) {
|
||||
err = -errno;
|
||||
|
@ -257,8 +258,7 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
|
|||
|
||||
for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
|
||||
int i;
|
||||
char *rest;
|
||||
char *address;
|
||||
char *rest, *address, str[PATH_MAX];
|
||||
|
||||
if (dent->d_name[0] == '.')
|
||||
continue;
|
||||
|
@ -267,7 +267,8 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) {
|
|||
continue;
|
||||
if (i < 1)
|
||||
continue;
|
||||
xsprintf(str, "%s/%s/address", slots, dent->d_name);
|
||||
|
||||
snprintf(str, sizeof str, "%s/%s/address", slots, dent->d_name);
|
||||
if (read_one_line_file(str, &address) >= 0) {
|
||||
/* match slot address with device by stripping the function */
|
||||
if (strneq(address, udev_device_get_sysname(names->pcidev), strlen(address)))
|
||||
|
|
Loading…
Reference in a new issue