kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zipl: Replace strcpy() and strcat()

Browse Source 
Use misc_asprintf() for concatenating strings and get rid of the
following GCC8 compile warnings:

disk.c: In function ‘disk_get_info’:
disk.c:247:43: warning: ‘%d’ directive output may be truncated writing
between 1 and 11 bytes int o a region of size between 0 and 79
[-Wformat-truncation=]
    snprintf(ppn_cmd, sizeof(ppn_cmd), "%s %d:%d",
                                           ^~
disk.c:247:39: note: using the range [-2147483648, 2147483647] for
directive argument
    snprintf(ppn_cmd, sizeof(ppn_cmd), "%s %d:%d",
                                       ^~~~~~~~~~
disk.c:247:39: note: using the range [-2147483648, 2147483647] for
directive argument
disk.c:247:4: note: ‘snprintf’ output between 5 and 104 bytes into a
destination of size 80
    snprintf(ppn_cmd, sizeof(ppn_cmd), "%s %d:%d",
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      script_file, major(stats.st_rdev),
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      minor(stats.st_rdev));
      ~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Jan Höppner
2018-09-20 15:01:13 +02:00
parent 52b2cb8424
commit b5a7b13e71
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
zipl/src/disk.c
View File

@@ -198,8 +198,8 @@ disk_get_info(const char* device, struct job_target_data* target,
long devsize;
FILE *fh;
char *script_pre = TOOLS_LIBDIR "/zipl_helper.";
char script_file[80];
char ppn_cmd[80];
char *script_file;
char *ppn_cmd;
char buffer[80];
char value[40];
int majnum, minnum;
@@ -235,23 +235,22 @@ disk_get_info(const char* device, struct job_target_data* target,
}
data->source = source_user;
/* Check if targetbase script is available */
strcpy(script_file, script_pre);
if (data->drv_name) {
strcat(script_file, data->drv_name);
}
if (data->drv_name)
misc_asprintf(&script_file, "%s%s", script_pre, data->drv_name);
else
misc_asprintf(&script_file, "%s", script_pre);
if ((target->targetbase == NULL) &&
(!stat(script_file, &script_stats))) {
data->source = source_script;
/* Run targetbase script */
strcpy(ppn_cmd, script_file);
if (target->bootmap_dir == NULL) {
/* happens in case of partition dump */
snprintf(ppn_cmd, sizeof(ppn_cmd), "%s %d:%d",
script_file, major(stats.st_rdev),
minor(stats.st_rdev));
misc_asprintf(&ppn_cmd, "%s %d:%d",
script_file, major(stats.st_rdev),
minor(stats.st_rdev));
} else {
strcat(ppn_cmd, " ");
strcat(ppn_cmd, target->bootmap_dir);
misc_asprintf(&ppn_cmd, "%s %s",
script_file, target->bootmap_dir);
}
printf("Run %s\n", ppn_cmd);
fh = popen(ppn_cmd, "r");
@@ -447,6 +446,7 @@ type_determined:
return 0;
out_close:
close(fd);
free(ppn_cmd);
free(data);
return -1;