|
423 | 423 | -v Print version information and exit.\n\ |
424 | 424 | ", banner, argv[ 0 ], argv[ 0 ] ); |
425 | 425 |
|
426 | | -#define exiso_log if ( ! s_quiet ) printf |
427 | | -#define flush() if ( ! s_quiet ) fflush( stdout ) |
| 426 | +#define exiso_log(...) if ( ! s_quiet ) { printf(__VA_ARGS__); } |
| 427 | +#define exiso_warn(...) if ( ! s_quiet ) { printf(__VA_ARGS__); s_warned = true; } |
| 428 | +#define flush() if ( ! s_quiet ) { fflush( stdout ); } |
428 | 429 |
|
429 | 430 | #define mem_err() { log_err( __FILE__, __LINE__, "out of memory error\n" ); err = 1; } |
430 | 431 | #define read_err() { log_err( __FILE__, __LINE__, "read error: %s\n", strerror( errno ) ); err = 1; } |
@@ -630,7 +631,7 @@ static bool s_real_quiet = false; |
630 | 631 | static bool s_media_enable = true; |
631 | 632 | static xoff_t s_total_bytes_all_isos = 0; |
632 | 633 | static int s_total_files_all_isos = 0; |
633 | | -static bool s_warned = 0; |
| 634 | +static bool s_warned = false; |
634 | 635 |
|
635 | 636 | static bool s_remove_systemupdate = false; |
636 | 637 | static char *s_systemupdate = "$SystemUpdate"; |
@@ -1677,7 +1678,7 @@ int extract_file( int in_xiso, dir_node *in_file, modes in_mode , char* path) { |
1677 | 1678 | size = min(in_file->file_size - i, READWRITE_BUFFER_SIZE); |
1678 | 1679 | } while (i < in_file->file_size && read_size > 0); |
1679 | 1680 | if (!err && i < in_file->file_size) { |
1680 | | - exiso_log("\nWARNING: File %s is truncated. Reported size: %u bytes, read size: %u bytes!", in_file->filename, in_file->file_size, i); |
| 1681 | + exiso_warn("\nWARNING: File %s is truncated. Reported size: %u bytes, read size: %u bytes!", in_file->filename, in_file->file_size, i); |
1681 | 1682 | in_file->file_size = i; |
1682 | 1683 | } |
1683 | 1684 | } |
@@ -1826,7 +1827,7 @@ int write_file( dir_node_avl *in_avl, write_tree_context *in_context, int in_dep |
1826 | 1827 | exiso_log(err ? "failed\n" : "[OK]\n"); |
1827 | 1828 |
|
1828 | 1829 | if (!err && i != in_avl->file_size) { |
1829 | | - exiso_log("WARNING: File %s is truncated. Reported size: %u bytes, wrote size: %u bytes!\n", in_avl->filename, i, in_avl->file_size); |
| 1830 | + exiso_warn("WARNING: File %s is truncated. Reported size: %u bytes, wrote size: %u bytes!\n", in_avl->filename, i, in_avl->file_size); |
1830 | 1831 | } |
1831 | 1832 |
|
1832 | 1833 | if (!err) { |
|
0 commit comments