Use matching single quotes in messages.
diff --git a/regress/add_from_buffer.c b/regress/add_from_buffer.c index f3fa7e9..0f07617 100644 --- a/regress/add_from_buffer.c +++ b/regress/add_from_buffer.c
@@ -64,7 +64,7 @@ if ((za=zip_open(archive, ZIP_CREATE, &err)) == NULL) { zip_error_to_str(buf, sizeof(buf), err, errno); - fprintf(stderr, "%s: can't open zip archive `%s': %s\n", prg, + fprintf(stderr, "%s: can't open zip archive '%s': %s\n", prg, archive, buf); return 1; } @@ -77,13 +77,13 @@ if (zip_add(za, file, zs) == -1) { zip_source_free(zs); - fprintf(stderr, "%s: can't add file `%s': %s\n", prg, + fprintf(stderr, "%s: can't add file '%s': %s\n", prg, file, zip_strerror(za)); return 1; } if (zip_close(za) == -1) { - fprintf(stderr, "%s: can't close zip archive `%s': %s\n", prg, + fprintf(stderr, "%s: can't close zip archive '%s': %s\n", prg, archive, zip_strerror(za)); return 1; }
diff --git a/regress/add_from_file_duplicate.test b/regress/add_from_file_duplicate.test index 081cae8..7aca619 100644 --- a/regress/add_from_file_duplicate.test +++ b/regress/add_from_file_duplicate.test
@@ -4,4 +4,4 @@ args -- testfile.zip add_file testfile.txt testfile.txt 0 -1 file testfile.txt testfile.txt testfile.txt file testfile.zip testfile.zip testfile.zip -stderr can't add file `testfile.txt': File already exists +stderr can't add file 'testfile.txt': File already exists
diff --git a/regress/add_from_file_twice_duplicate.test b/regress/add_from_file_twice_duplicate.test index 2af2975..e5a0f99 100644 --- a/regress/add_from_file_twice_duplicate.test +++ b/regress/add_from_file_twice_duplicate.test
@@ -4,4 +4,4 @@ args -- testfile.zip add_file testfile.txt testfile.txt 0 -1 add_file testfile.txt testfile.txt 0 -1 file testfile.txt testfile.txt testfile.txt file-new testfile.zip testfile.zip -stderr can't add file `testfile.txt': File already exists +stderr can't add file 'testfile.txt': File already exists
diff --git a/regress/add_from_filep.c b/regress/add_from_filep.c index e4edb35..1b46416 100644 --- a/regress/add_from_filep.c +++ b/regress/add_from_filep.c
@@ -66,19 +66,19 @@ if ((za=zip_open(archive, ZIP_CREATE, &err)) == NULL) { zip_error_to_str(buf, sizeof(buf), err, errno); - fprintf(stderr, "%s: can't open zip archive `%s': %s\n", prg, + fprintf(stderr, "%s: can't open zip archive '%s': %s\n", prg, archive, buf); return 1; } if ((fp=fopen(file, "r")) == NULL) { - fprintf(stderr, "%s: can't open input file `%s': %s\n", prg, + fprintf(stderr, "%s: can't open input file '%s': %s\n", prg, file, strerror(errno)); return 1; } if ((zs=zip_source_filep(za, fp, 0, -1)) == NULL) { - fprintf(stderr, "%s: error creating file source for `%s': %s\n", prg, + fprintf(stderr, "%s: error creating file source for '%s': %s\n", prg, file, zip_strerror(za)); return 1; } @@ -88,13 +88,13 @@ if (zip_add(za, name, zs) == -1) { zip_source_free(zs); - fprintf(stderr, "%s: can't add file `%s': %s\n", prg, + fprintf(stderr, "%s: can't add file '%s': %s\n", prg, file, zip_strerror(za)); return 1; } if (zip_close(za) == -1) { - fprintf(stderr, "%s: can't close zip archive `%s': %s\n", prg, + fprintf(stderr, "%s: can't close zip archive '%s': %s\n", prg, archive, zip_strerror(za)); return 1; }
diff --git a/regress/delete_invalid.test b/regress/delete_invalid.test index 6cf34db..fe317ec 100644 --- a/regress/delete_invalid.test +++ b/regress/delete_invalid.test
@@ -3,4 +3,4 @@ return 1 args testfile.zzip delete 5 file testfile.zzip testfile.zip testfile.zip -stderr can't delete file at index `5': Invalid argument +stderr can't delete file at index '5': Invalid argument
diff --git a/regress/encoding-cp437-all.test b/regress/encoding-cp437-all.test index 1e5ca73..ed36bd6 100644 --- a/regress/encoding-cp437-all.test +++ b/regress/encoding-cp437-all.test
@@ -2,4 +2,4 @@ program cp437 return 0 args "" -stdout UTF-8 version: ☺☻♥♦♣♠•◘○◙♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~⌂ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ +stdout UTF-8 version: ☺☻♥♦♣♠•◘○◙♂♀♪♫☼►◄↕‼¶§▬↨↑↓→←∟↔▲▼ !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_'abcdefghijklmnopqrstuvwxyz{|}~⌂ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■
diff --git a/regress/encrypt.test b/regress/encrypt.test index c36018f..f325f91 100644 --- a/regress/encrypt.test +++ b/regress/encrypt.test
@@ -4,21 +4,21 @@ return 0 args encrypt.zzip 0 1 file encrypt.zzip encrypt.zip encrypt.zip -stdout name: `encrypted' -stdout index: `0' -stdout size: `4' -stdout compressed size: `16' -stdout mtime: `Mon Apr 24 2006 16:01:34' -stdout crc: `7e3265a8' -stdout compression method: `0' -stdout encryption method: `1' +stdout name: 'encrypted' +stdout index: '0' +stdout size: '4' +stdout compressed size: '16' +stdout mtime: 'Mon Apr 24 2006 16:01:34' +stdout crc: '7e3265a8' +stdout compression method: '0' +stdout encryption method: '1' stdout -stdout name: `plain' -stdout index: `1' -stdout size: `4' -stdout compressed size: `4' -stdout mtime: `Mon Apr 24 2006 16:01:42' -stdout crc: `7e3265a8' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'plain' +stdout index: '1' +stdout size: '4' +stdout compressed size: '4' +stdout mtime: 'Mon Apr 24 2006 16:01:42' +stdout crc: '7e3265a8' +stdout compression method: '0' +stdout encryption method: '0' stdout
diff --git a/regress/fopen_unchanged.c b/regress/fopen_unchanged.c index 5b30e2b..39277f6 100644 --- a/regress/fopen_unchanged.c +++ b/regress/fopen_unchanged.c
@@ -61,7 +61,7 @@ if ((za=zip_open(archive, ZIP_CREATE, &err)) == NULL) { zip_error_to_str(buf, sizeof(buf), err, errno); - fprintf(stderr, "can't open zip archive `%s': %s\n", archive, buf); + fprintf(stderr, "can't open zip archive '%s': %s\n", archive, buf); return 1; } @@ -72,17 +72,17 @@ if (zip_add(za, file, zs) == -1) { zip_source_free(zs); - fprintf(stderr, "can't add file `%s': %s\n", file, zip_strerror(za)); + fprintf(stderr, "can't add file '%s': %s\n", file, zip_strerror(za)); return 1; } if (zip_fopen(za, file, ZIP_FL_UNCHANGED) == NULL) { - fprintf(stderr, "can't zip_fopen file `%s': %s\n", file, zip_strerror(za)); + fprintf(stderr, "can't zip_fopen file '%s': %s\n", file, zip_strerror(za)); return 1; } if (zip_close(za) == -1) { - fprintf(stderr, "can't close zip archive `%s': %s\n", archive, zip_strerror(za)); + fprintf(stderr, "can't close zip archive '%s': %s\n", archive, zip_strerror(za)); return 1; }
diff --git a/regress/fopen_unchanged.test b/regress/fopen_unchanged.test index 5e55d0c..885f8b7 100644 --- a/regress/fopen_unchanged.test +++ b/regress/fopen_unchanged.test
@@ -2,4 +2,4 @@ program fopen_unchanged return 1 args testbuffer.zip -stderr can't zip_fopen file `teststring.txt': No such file +stderr can't zip_fopen file 'teststring.txt': No such file
diff --git a/regress/fread.c b/regress/fread.c index 0c7dbd8..ee8dccb 100644 --- a/regress/fread.c +++ b/regress/fread.c
@@ -100,7 +100,7 @@ if ((z=zip_open(archive, 0, &ze)) == NULL) { zip_error_to_str(errstr, sizeof(errstr), ze, errno); - printf("%s: can't open zip archive `%s': %s\n", + printf("%s: can't open zip archive '%s': %s\n", prg, archive, errstr); return 1; } @@ -139,7 +139,7 @@ zip_unchange_all(z); if (zip_close(z) == -1) { - fprintf(stderr, "%s: can't close zip archive `%s': %s\n", prg, archive, zip_strerror(z)); + fprintf(stderr, "%s: can't close zip archive '%s': %s\n", prg, archive, zip_strerror(z)); return 1; }
diff --git a/regress/get_comment.test b/regress/get_comment.test index 09a8cbb..735cc97 100644 --- a/regress/get_comment.test +++ b/regress/get_comment.test
@@ -9,7 +9,7 @@ stdout stdout Longer. stdout -stdout No comment for `file1' -stdout File comment for `file2': First one had no comment. -stdout File comment for `file3': Third one. -stdout File comment for `file4': Last. +stdout No comment for 'file1' +stdout File comment for 'file2': First one had no comment. +stdout File comment for 'file3': Third one. +stdout File comment for 'file4': Last.
diff --git a/regress/modify.c b/regress/modify.c index 6897ab9..80e867d 100644 --- a/regress/modify.c +++ b/regress/modify.c
@@ -163,7 +163,7 @@ if ((za=zip_open(archive, flags, &err)) == NULL) { zip_error_to_str(buf, sizeof(buf), err, errno); - fprintf(stderr, "can't open zip archive `%s': %s\n", archive, buf); + fprintf(stderr, "can't open zip archive '%s': %s\n", archive, buf); return 1; } @@ -179,7 +179,7 @@ if (zip_add(za, argv[arg+1], zs) == -1) { zip_source_free(zs); - fprintf(stderr, "can't add file `%s': %s\n", argv[arg+1], zip_strerror(za)); + fprintf(stderr, "can't add file '%s': %s\n", argv[arg+1], zip_strerror(za)); err = 1; break; } @@ -187,7 +187,7 @@ } else if (strcmp(argv[arg], "add_dir") == 0 && arg+1 < argc) { /* add directory */ if (zip_add_dir(za, argv[arg+1]) < 0) { - fprintf(stderr, "can't add directory `%s': %s\n", argv[arg+1], zip_strerror(za)); + fprintf(stderr, "can't add directory '%s': %s\n", argv[arg+1], zip_strerror(za)); err = 1; break; } @@ -202,7 +202,7 @@ if (zip_add(za, argv[arg+1], zs) == -1) { zip_source_free(zs); - fprintf(stderr, "can't add file `%s': %s\n", argv[arg+1], zip_strerror(za)); + fprintf(stderr, "can't add file '%s': %s\n", argv[arg+1], zip_strerror(za)); err = 1; break; } @@ -212,18 +212,18 @@ idx = atoi(argv[arg+3]); if ((z_in=zip_open(argv[arg+2], ZIP_CHECKCONS, &err)) == NULL) { zip_error_to_str(buf, sizeof(buf), err, errno); - fprintf(stderr, "can't open source zip archive `%s': %s\n", argv[arg+2], buf); + fprintf(stderr, "can't open source zip archive '%s': %s\n", argv[arg+2], buf); err = 1; break; } if ((zs=zip_source_zip(za, z_in, idx, 0, atoi(argv[arg+4]), atoi(argv[arg+5]))) == NULL) { - fprintf(stderr, "error creating file source from `%s' index '%d': %s\n", argv[arg+2], idx, zip_strerror(za)); + fprintf(stderr, "error creating file source from '%s' index '%d': %s\n", argv[arg+2], idx, zip_strerror(za)); zip_close(z_in); err = 1; break; } if (zip_add(za, argv[arg+1], zs) == -1) { - fprintf(stderr, "can't add file `%s': %s\n", argv[arg+1], zip_strerror(za)); + fprintf(stderr, "can't add file '%s': %s\n", argv[arg+1], zip_strerror(za)); zip_source_free(zs); zip_close(z_in); err = 1; @@ -236,7 +236,7 @@ idx = atoi(argv[arg+1]); ceflags = get_flags(argv[arg+2]); if ((count=zip_file_extra_fields_count(za, idx, ceflags)) < 0) { - fprintf(stderr, "can't get extra field count for file at index `%d': %s\n", idx, zip_strerror(za)); + fprintf(stderr, "can't get extra field count for file at index '%d': %s\n", idx, zip_strerror(za)); err = 1; break; } else { @@ -250,7 +250,7 @@ eid = atoi(argv[arg+2]); ceflags = get_flags(argv[arg+3]); if ((count=zip_file_extra_fields_count_by_id(za, idx, eid, ceflags)) < 0) { - fprintf(stderr, "can't get extra field count for file at index `%d' and for id `%d': %s\n", idx, eid, zip_strerror(za)); + fprintf(stderr, "can't get extra field count for file at index '%d' and for id `%d': %s\n", idx, eid, zip_strerror(za)); err = 1; break; } else { @@ -261,7 +261,7 @@ /* delete */ idx = atoi(argv[arg+1]); if (zip_delete(za, idx) < 0) { - fprintf(stderr, "can't delete file at index `%d': %s\n", idx, zip_strerror(za)); + fprintf(stderr, "can't delete file at index '%d': %s\n", idx, zip_strerror(za)); err = 1; break; } @@ -273,7 +273,7 @@ eid = atoi(argv[arg+2]); geflags = get_flags(argv[arg+3]); if ((zip_file_extra_field_delete(za, idx, eid, geflags)) < 0) { - fprintf(stderr, "can't delete extra field data for file at index `%d', extra field id `%d': %s\n", idx, eid, zip_strerror(za)); + fprintf(stderr, "can't delete extra field data for file at index '%d', extra field id `%d': %s\n", idx, eid, zip_strerror(za)); err = 1; break; } @@ -286,7 +286,7 @@ eidx = atoi(argv[arg+3]); geflags = get_flags(argv[arg+4]); if ((zip_file_extra_field_delete_by_id(za, idx, eid, eidx, geflags)) < 0) { - fprintf(stderr, "can't delete extra field data for file at index `%d', extra field id `%d', extra field idx `%d': %s\n", idx, eid, eidx, zip_strerror(za)); + fprintf(stderr, "can't delete extra field data for file at index '%d', extra field id `%d', extra field idx `%d': %s\n", idx, eid, eidx, zip_strerror(za)); err = 1; break; } @@ -346,19 +346,19 @@ /* get file comment */ idx = atoi(argv[arg+1]); if ((comment=zip_get_file_comment(za, idx, &len, 0)) == NULL) { - fprintf(stderr, "can't get comment for `%s': %s\n", zip_get_name(za, idx, 0), zip_strerror(za)); + fprintf(stderr, "can't get comment for '%s': %s\n", zip_get_name(za, idx, 0), zip_strerror(za)); err = 1; break; } else if (len == 0) - printf("No comment for `%s'\n", zip_get_name(za, idx, 0)); + printf("No comment for '%s'\n", zip_get_name(za, idx, 0)); else - printf("File comment for `%s': %.*s\n", zip_get_name(za, idx, 0), len, comment); + printf("File comment for '%s': %.*s\n", zip_get_name(za, idx, 0), len, comment); arg += 2; } else if (strcmp(argv[arg], "rename") == 0 && arg+2 < argc) { /* rename */ idx = atoi(argv[arg+1]); if (zip_rename(za, idx, argv[arg+2]) < 0) { - fprintf(stderr, "can't rename file at index `%d' to `%s': %s\n", idx, argv[arg+2], zip_strerror(za)); + fprintf(stderr, "can't rename file at index '%d' to `%s': %s\n", idx, argv[arg+2], zip_strerror(za)); err = 1; break; } @@ -373,7 +373,7 @@ geflags = get_flags(argv[arg+4]); efdata = (zip_uint8_t *)argv[arg+5]; if ((zip_file_extra_field_set(za, idx, eid, eidx, efdata, (zip_uint16_t)strlen((const char *)efdata), geflags)) < 0) { - fprintf(stderr, "can't set extra field data for file at index `%d', extra field id `%d', index `%d': %s\n", idx, eid, eidx, zip_strerror(za)); + fprintf(stderr, "can't set extra field data for file at index '%d', extra field id `%d', index `%d': %s\n", idx, eid, eidx, zip_strerror(za)); err = 1; break; } @@ -382,7 +382,7 @@ /* set file comment */ idx = atoi(argv[arg+1]); if (zip_file_set_comment(za, idx, argv[arg+2], (zip_uint16_t)strlen(argv[arg+2]), 0) < 0) { - fprintf(stderr, "can't set file comment at index `%d' to `%s': %s\n", idx, argv[arg+2], zip_strerror(za)); + fprintf(stderr, "can't set file comment at index '%d' to `%s': %s\n", idx, argv[arg+2], zip_strerror(za)); err = 1; break; } @@ -395,20 +395,20 @@ method = get_compression_method(argv[arg+2]); flags = atoi(argv[arg+3]); if (zip_set_file_compression(za, idx, method, flags) < 0) { - fprintf(stderr, "can't set file compression method at index `%d' to `%s', flags `%d': %s\n", idx, argv[arg+2], flags, zip_strerror(za)); + fprintf(stderr, "can't set file compression method at index '%d' to `%s', flags `%d': %s\n", idx, argv[arg+2], flags, zip_strerror(za)); err = 1; break; } arg += 4; } else { - fprintf(stderr, "unrecognized command `%s', or not enough arguments\n", argv[arg]); + fprintf(stderr, "unrecognized command '%s', or not enough arguments\n", argv[arg]); err = 1; break; } } if (zip_close(za) == -1) { - fprintf(stderr, "can't close zip archive `%s': %s\n", archive, zip_strerror(za)); + fprintf(stderr, "can't close zip archive '%s': %s\n", archive, zip_strerror(za)); return 1; }
diff --git a/regress/name_locate.c b/regress/name_locate.c index fe8f611..3ebd4a0 100644 --- a/regress/name_locate.c +++ b/regress/name_locate.c
@@ -70,7 +70,7 @@ if ((z=zip_open(archive, 0, &ze)) == NULL) { char buf2[100]; zip_error_to_str(buf2, sizeof(buf2), ze, errno); - printf("%s: can't open zip archive `%s': %s\n", prg, + printf("%s: can't open zip archive '%s': %s\n", prg, archive, buf2); return 1; } @@ -107,7 +107,7 @@ fail += find_fail(z, "new", 0, ZIP_ER_NOENT); if (zip_close(z) == -1) { - fprintf(stderr, "%s: can't close zip archive `%s': %s\n", prg, + fprintf(stderr, "%s: can't close zip archive '%s': %s\n", prg, archive, zip_strerror(z)); return 1; } @@ -128,7 +128,7 @@ zip_error_get(z, &ze, &se); if (ze != zerr) { zip_error_to_str(expected, sizeof(expected), zerr, 0); - printf("unexpected error while looking for `%s' with flags %x: got `%s', expected `%s'\n", + printf("unexpected error while looking for '%s' with flags %x: got `%s', expected `%s'\n", name, flags, zip_strerror(z), expected); return 1; } @@ -136,7 +136,7 @@ return 0; } - printf("unexpected success while looking for `%s' with flags %x: index %" PRId64 "\n", name, flags, idx); + printf("unexpected success while looking for '%s' with flags %x: index %" PRId64 "\n", name, flags, idx); return 1; } @@ -147,7 +147,7 @@ { if (zip_name_locate(z, name, flags) < 0) { - printf("unexpected error while looking for `%s' with flags %x: %s\n", + printf("unexpected error while looking for '%s' with flags %x: %s\n", name, flags, zip_strerror(z)); return 1; }
diff --git a/regress/open_cons_extrabytes.test b/regress/open_cons_extrabytes.test index 875c860..beeb90e 100644 --- a/regress/open_cons_extrabytes.test +++ b/regress/open_cons_extrabytes.test
@@ -3,5 +3,5 @@ file testextrabytes.zzip testextrabytes.zip testextrabytes.zip args -c testextrabytes.zzip return 1 -stdout opening `testextrabytes.zzip' returned error 21 +stdout opening 'testextrabytes.zzip' returned error 21 stderr 1 errors
diff --git a/regress/open_empty.test b/regress/open_empty.test index 250bc40..8f05d29 100644 --- a/regress/open_empty.test +++ b/regress/open_empty.test
@@ -3,4 +3,4 @@ file testempty.zip testempty.zip testempty.zip args testempty.zip return 0 -stdout opening `testempty.zip' succeeded, 0 entries +stdout opening 'testempty.zip' succeeded, 0 entries
diff --git a/regress/open_empty_2.test b/regress/open_empty_2.test index 0f6e215..07a5358 100644 --- a/regress/open_empty_2.test +++ b/regress/open_empty_2.test
@@ -3,4 +3,4 @@ file testfile.txt testfile.txt testfile.txt args testfile.txt return 0 -stdout opening `testfile.txt' succeeded, 0 entries +stdout opening 'testfile.txt' succeeded, 0 entries
diff --git a/regress/open_extrabytes.test b/regress/open_extrabytes.test index 80227ab..1cfce24 100644 --- a/regress/open_extrabytes.test +++ b/regress/open_extrabytes.test
@@ -3,4 +3,4 @@ file testextrabytes.zzip testextrabytes.zip testextrabytes.zip args testextrabytes.zzip return 0 -stdout opening `testextrabytes.zzip' succeeded, 1 entries +stdout opening 'testextrabytes.zzip' succeeded, 1 entries
diff --git a/regress/open_filename_duplicate.test b/regress/open_filename_duplicate.test index acfacf0..c8cc727 100644 --- a/regress/open_filename_duplicate.test +++ b/regress/open_filename_duplicate.test
@@ -3,4 +3,4 @@ args filename_duplicate.zip return 0 file filename_duplicate.zip filename_duplicate.zip filename_duplicate.zip -stdout opening `filename_duplicate.zip' succeeded, 2 entries +stdout opening 'filename_duplicate.zip' succeeded, 2 entries
diff --git a/regress/open_filename_duplicate_empty.test b/regress/open_filename_duplicate_empty.test index 43859e3..505916b 100644 --- a/regress/open_filename_duplicate_empty.test +++ b/regress/open_filename_duplicate_empty.test
@@ -3,4 +3,4 @@ args filename_duplicate_empty.zip return 0 file filename_duplicate_empty.zip filename_duplicate_empty.zip filename_duplicate_empty.zip -stdout opening `filename_duplicate_empty.zip' succeeded, 2 entries +stdout opening 'filename_duplicate_empty.zip' succeeded, 2 entries
diff --git a/regress/open_filename_empty.test b/regress/open_filename_empty.test index 484ebaa..96f3efc 100644 --- a/regress/open_filename_empty.test +++ b/regress/open_filename_empty.test
@@ -3,4 +3,4 @@ args filename_empty.zip return 0 file filename_empty.zip filename_empty.zip filename_empty.zip -stdout opening `filename_empty.zip' succeeded, 1 entries +stdout opening 'filename_empty.zip' succeeded, 1 entries
diff --git a/regress/open_incons.test b/regress/open_incons.test index a858ede..d42c928 100644 --- a/regress/open_incons.test +++ b/regress/open_incons.test
@@ -37,42 +37,42 @@ file incons-local-size-larger.zzip incons-local-size-larger.zip incons-local-size-larger.zip args -c incons-* return 1 -stdout opening `incons-archive-comment-longer.zzip' returned error 21 -stdout opening `incons-archive-comment-shorter.zzip' returned error 21 -stdout opening `incons-cdoffset.zzip' returned error 21 -stdout opening `incons-central-compression-method.zzip' returned error 21 -stdout opening `incons-central-compsize-larger-toolarge.zzip' returned error 19 -stdout opening `incons-central-compsize-larger.zzip' returned error 21 -stdout opening `incons-central-compsize-smaller.zzip' returned error 21 -stdout opening `incons-central-crc.zzip' returned error 21 -stdout opening `incons-central-date.zzip' returned error 21 -stdout opening `incons-central-file-comment-longer.zzip' returned error 21 -stdout opening `incons-central-file-comment-shorter.zzip' returned error 21 -stdout opening `incons-central-magic-bad.zzip' returned error 19 -stdout opening `incons-central-magic-bad2.zzip' returned error 19 -stdout opening `incons-central-size-larger.zzip' returned error 21 +stdout opening 'incons-archive-comment-longer.zzip' returned error 21 +stdout opening 'incons-archive-comment-shorter.zzip' returned error 21 +stdout opening 'incons-cdoffset.zzip' returned error 21 +stdout opening 'incons-central-compression-method.zzip' returned error 21 +stdout opening 'incons-central-compsize-larger-toolarge.zzip' returned error 19 +stdout opening 'incons-central-compsize-larger.zzip' returned error 21 +stdout opening 'incons-central-compsize-smaller.zzip' returned error 21 +stdout opening 'incons-central-crc.zzip' returned error 21 +stdout opening 'incons-central-date.zzip' returned error 21 +stdout opening 'incons-central-file-comment-longer.zzip' returned error 21 +stdout opening 'incons-central-file-comment-shorter.zzip' returned error 21 +stdout opening 'incons-central-magic-bad.zzip' returned error 19 +stdout opening 'incons-central-magic-bad2.zzip' returned error 19 +stdout opening 'incons-central-size-larger.zzip' returned error 21 # tryopen does not test checksums, so this is fine. -stdout opening `incons-data.zzip' succeeded, 1 entries -stdout opening `incons-ef-central-size-wrong.zzip' returned error 21 -stdout opening `incons-ef-local-id-size.zzip' returned error 21 +stdout opening 'incons-data.zzip' succeeded, 1 entries +stdout opening 'incons-ef-central-size-wrong.zzip' returned error 21 +stdout opening 'incons-ef-local-id-size.zzip' returned error 21 # different extra fields local vs. central is fine -stdout opening `incons-ef-local-id.zzip' succeeded, 1 entries -stdout opening `incons-ef-local-incomplete1.zzip' returned error 21 -stdout opening `incons-ef-local-incomplete2.zzip' returned error 21 -stdout opening `incons-ef-local-incomplete3.zzip' returned error 21 +stdout opening 'incons-ef-local-id.zzip' succeeded, 1 entries +stdout opening 'incons-ef-local-incomplete1.zzip' returned error 21 +stdout opening 'incons-ef-local-incomplete2.zzip' returned error 21 +stdout opening 'incons-ef-local-incomplete3.zzip' returned error 21 # EF consisting of 4 zero bytes is technically ok -stdout opening `incons-ef-local-incomplete4.zzip' succeeded, 1 entries -stdout opening `incons-ef-local-size.zzip' returned error 21 -stdout opening `incons-eocd-magic-bad.zzip' returned error 19 -stdout opening `incons-file-count.zzip' returned error 21 -stdout opening `incons-local-compression-method.zzip' returned error 21 -stdout opening `incons-local-compsize-larger.zzip' returned error 21 -stdout opening `incons-local-compsize-smaller.zzip' returned error 21 -stdout opening `incons-local-crc.zzip' returned error 21 -stdout opening `incons-local-filename-long.zzip' returned error 21 -stdout opening `incons-local-filename-missing.zzip' returned error 21 -stdout opening `incons-local-filename-short.zzip' returned error 21 -stdout opening `incons-local-filename.zzip' returned error 21 -stdout opening `incons-local-magic-bad.zzip' returned error 19 -stdout opening `incons-local-size-larger.zzip' returned error 21 +stdout opening 'incons-ef-local-incomplete4.zzip' succeeded, 1 entries +stdout opening 'incons-ef-local-size.zzip' returned error 21 +stdout opening 'incons-eocd-magic-bad.zzip' returned error 19 +stdout opening 'incons-file-count.zzip' returned error 21 +stdout opening 'incons-local-compression-method.zzip' returned error 21 +stdout opening 'incons-local-compsize-larger.zzip' returned error 21 +stdout opening 'incons-local-compsize-smaller.zzip' returned error 21 +stdout opening 'incons-local-crc.zzip' returned error 21 +stdout opening 'incons-local-filename-long.zzip' returned error 21 +stdout opening 'incons-local-filename-missing.zzip' returned error 21 +stdout opening 'incons-local-filename-short.zzip' returned error 21 +stdout opening 'incons-local-filename.zzip' returned error 21 +stdout opening 'incons-local-magic-bad.zzip' returned error 19 +stdout opening 'incons-local-size-larger.zzip' returned error 21 stderr 32 errors
diff --git a/regress/open_many_ok.test b/regress/open_many_ok.test index c843fb1..8a9c7ce 100644 --- a/regress/open_many_ok.test +++ b/regress/open_many_ok.test
@@ -3,4 +3,4 @@ args manyfiles.zip return 0 file manyfiles.zip manyfiles.zip manyfiles.zip -stdout opening `manyfiles.zip' succeeded, 70000 entries +stdout opening 'manyfiles.zip' succeeded, 70000 entries
diff --git a/regress/open_new_but_exists.test b/regress/open_new_but_exists.test index be3c9d1..002ccb4 100644 --- a/regress/open_new_but_exists.test +++ b/regress/open_new_but_exists.test
@@ -3,5 +3,5 @@ args -e test.zip return 1 file test.zip test.zip test.zip -stdout opening `test.zip' returned error 10 +stdout opening 'test.zip' returned error 10 stderr 1 errors
diff --git a/regress/open_new_ok.test b/regress/open_new_ok.test index 04a453a..b1452c7 100644 --- a/regress/open_new_ok.test +++ b/regress/open_new_ok.test
@@ -2,4 +2,4 @@ program tryopen args -n new.zip return 0 -stdout opening `new.zip' succeeded, 0 entries +stdout opening 'new.zip' succeeded, 0 entries
diff --git a/regress/open_nonarchive.test b/regress/open_nonarchive.test index c2a9fd5..c81b542 100644 --- a/regress/open_nonarchive.test +++ b/regress/open_nonarchive.test
@@ -3,5 +3,5 @@ file Makefile.am Makefile.am Makefile.am args Makefile.am return 1 -stdout opening `Makefile.am' returned error 19 +stdout opening 'Makefile.am' returned error 19 stderr 1 errors
diff --git a/regress/open_nosuchfile.test b/regress/open_nosuchfile.test index 414cd5c..647e098 100644 --- a/regress/open_nosuchfile.test +++ b/regress/open_nosuchfile.test
@@ -2,5 +2,5 @@ program tryopen args nosuchfile return 1 -stdout opening `nosuchfile' returned error 11/2 +stdout opening 'nosuchfile' returned error 11/2 stderr 1 errors
diff --git a/regress/open_ok.test b/regress/open_ok.test index ca3498a..dd1f38e 100644 --- a/regress/open_ok.test +++ b/regress/open_ok.test
@@ -3,4 +3,4 @@ args test.zip return 0 file test.zip test.zip test.zip -stdout opening `test.zip' succeeded, 3 entries +stdout opening 'test.zip' succeeded, 3 entries
diff --git a/regress/open_truncate.test b/regress/open_truncate.test index ac23068..7ef7537 100644 --- a/regress/open_truncate.test +++ b/regress/open_truncate.test
@@ -3,4 +3,4 @@ args -t test.zip return 0 file-del test.zip test.zip -stdout opening `test.zip' succeeded, 0 entries +stdout opening 'test.zip' succeeded, 0 entries
diff --git a/regress/open_zip64_ok.test b/regress/open_zip64_ok.test index ab39c9a..ac33f9a 100644 --- a/regress/open_zip64_ok.test +++ b/regress/open_zip64_ok.test
@@ -3,4 +3,4 @@ args test.zip return 0 file test.zip zip64.zip zip64.zip -stdout opening `test.zip' succeeded, 1 entries +stdout opening 'test.zip' succeeded, 1 entries
diff --git a/regress/rename_deleted.test b/regress/rename_deleted.test index c304b73..c323e16 100644 --- a/regress/rename_deleted.test +++ b/regress/rename_deleted.test
@@ -3,4 +3,4 @@ return 1 args testfile.zip delete 1 delete 3 rename 1 othername file testfile.zip testcomment.zip testcomment13.zip -stderr can't rename file at index `1' to `othername': Entry has been deleted +stderr can't rename file at index '1' to `othername': Entry has been deleted
diff --git a/regress/rename_fail.test b/regress/rename_fail.test index 0fc2868..ccff307 100644 --- a/regress/rename_fail.test +++ b/regress/rename_fail.test
@@ -3,4 +3,4 @@ return 1 args rename.zip rename 0 file4 file rename.zip testcomment.zip testcomment.zip -stderr can't rename file at index `0' to `file4': File already exists +stderr can't rename file at index '0' to `file4': File already exists
diff --git a/regress/runtest b/regress/runtest index 0081496..634f7f2 100755 --- a/regress/runtest +++ b/regress/runtest
@@ -250,6 +250,7 @@ fi fi +VERBOSE=1 if [ -z "${VERBOSE}" ] then DIFF_FLAGS=''
diff --git a/regress/set_comment_all.c b/regress/set_comment_all.c index ae6b93c..1061c7a 100644 --- a/regress/set_comment_all.c +++ b/regress/set_comment_all.c
@@ -65,7 +65,7 @@ if ((za=zip_open(archive, 0, &err)) == NULL) { zip_error_to_str(buf, sizeof(buf), err, errno); - fprintf(stderr, "%s: can't open zip archive `%s': %s\n", prg, + fprintf(stderr, "%s: can't open zip archive '%s': %s\n", prg, archive, buf); return 1; } @@ -87,7 +87,7 @@ } if (zip_close(za) == -1) { - fprintf(stderr, "%s: can't close zip archive `%s': %s\n", prg, archive, zip_strerror(za)); + fprintf(stderr, "%s: can't close zip archive '%s': %s\n", prg, archive, zip_strerror(za)); return 1; }
diff --git a/regress/set_comment_localonly.c b/regress/set_comment_localonly.c index 6e89961..cccab5b 100644 --- a/regress/set_comment_localonly.c +++ b/regress/set_comment_localonly.c
@@ -62,7 +62,7 @@ if ((za=zip_open(archive, 0, &err)) == NULL) { zip_error_to_str(buf, sizeof(buf), err, errno); - fprintf(stderr, "%s: can't open zip archive `%s': %s\n", prg, + fprintf(stderr, "%s: can't open zip archive '%s': %s\n", prg, archive, buf); return 1; } @@ -83,7 +83,7 @@ } if (zip_close(za) == -1) { - fprintf(stderr, "%s: can't close zip archive `%s': %s\n", prg, archive, zip_strerror(za)); + fprintf(stderr, "%s: can't close zip archive '%s': %s\n", prg, archive, zip_strerror(za)); return 1; }
diff --git a/regress/set_comment_removeglobal.c b/regress/set_comment_removeglobal.c index 2792372..4abe00f 100644 --- a/regress/set_comment_removeglobal.c +++ b/regress/set_comment_removeglobal.c
@@ -61,7 +61,7 @@ if ((za=zip_open(archive, 0, &err)) == NULL) { zip_error_to_str(buf, sizeof(buf), err, errno); - fprintf(stderr, "%s: can't open zip archive `%s': %s\n", prg, + fprintf(stderr, "%s: can't open zip archive '%s': %s\n", prg, archive, buf); return 1; } @@ -73,7 +73,7 @@ } if (zip_close(za) == -1) { - fprintf(stderr, "%s: can't close zip archive `%s': %s\n", prg, archive, zip_strerror(za)); + fprintf(stderr, "%s: can't close zip archive '%s': %s\n", prg, archive, zip_strerror(za)); return 1; }
diff --git a/regress/set_comment_revert.c b/regress/set_comment_revert.c index e32f282..ad3635c 100644 --- a/regress/set_comment_revert.c +++ b/regress/set_comment_revert.c
@@ -65,7 +65,7 @@ if ((za=zip_open(archive, 0, &err)) == NULL) { zip_error_to_str(buf, sizeof(buf), err, errno); - fprintf(stderr, "%s: can't open zip archive `%s': %s\n", prg, + fprintf(stderr, "%s: can't open zip archive '%s': %s\n", prg, archive, buf); return 1; } @@ -87,13 +87,13 @@ } if (zip_unchange_all(za) == -1) { - fprintf(stderr, "%s: can't revert changes to archive `%s'\n", + fprintf(stderr, "%s: can't revert changes to archive '%s'\n", prg, archive); return 1; } if (zip_close(za) == -1) { - fprintf(stderr, "%s: can't close zip archive `%s': %s\n", prg, archive, zip_strerror(za)); + fprintf(stderr, "%s: can't close zip archive '%s': %s\n", prg, archive, zip_strerror(za)); return 1; }
diff --git a/regress/set_compression.c b/regress/set_compression.c index 6fb15df..d7576bb 100644 --- a/regress/set_compression.c +++ b/regress/set_compression.c
@@ -67,22 +67,22 @@ if ((za=zip_open(archive, 0, &err)) == NULL) { zip_error_to_str(buf, sizeof(buf), err, errno); - fprintf(stderr, "%s: can't open zip archive `%s': %s\n", prg, + fprintf(stderr, "%s: can't open zip archive '%s': %s\n", prg, archive, buf); return 1; } if ((idx=zip_name_locate(za, name, 0)) < 0) { - printf("%s: unexpected error while looking for `%s': %s\n", + printf("%s: unexpected error while looking for '%s': %s\n", prg, name, zip_strerror(za)); return 1; } if (zip_set_file_compression(za, idx, method, /* TODO: add flags * when supported */ 0) < 0) { - fprintf(stderr, "zip_set_file_compression with method `%d' on file %" PRId64 " failed: %s\n", + fprintf(stderr, "zip_set_file_compression with method '%d' on file %" PRId64 " failed: %s\n", method, idx, zip_strerror(za)); return 1; } if (zip_close(za) == -1) { - fprintf(stderr, "%s: can't close zip archive `%s': %s\n", prg, archive, zip_strerror(za)); + fprintf(stderr, "%s: can't close zip archive '%s': %s\n", prg, archive, zip_strerror(za)); return 1; }
diff --git a/regress/set_compression_unknown.test b/regress/set_compression_unknown.test index 6fd9976..34d1c8f 100644 --- a/regress/set_compression_unknown.test +++ b/regress/set_compression_unknown.test
@@ -3,4 +3,4 @@ return 1 args test.zip abac-repeat.txt -99 file test.zip teststored.zip teststored.zip -stderr zip_set_file_compression with method `-99' on file 0 failed: Compression method not supported +stderr zip_set_file_compression with method '-99' on file 0 failed: Compression method not supported
diff --git a/regress/stat_index.c b/regress/stat_index.c index c09b5fd..9d9b0c7 100644 --- a/regress/stat_index.c +++ b/regress/stat_index.c
@@ -95,7 +95,7 @@ if ((z=zip_open(fname, flags, &ze)) == NULL) { zip_error_to_str(buf, sizeof(buf), ze, errno); - fprintf(stderr, "%s: can't open zip archive `%s': %s\n", prg, + fprintf(stderr, "%s: can't open zip archive '%s': %s\n", prg, fname, buf); return 1; } @@ -104,38 +104,38 @@ index = atoi(argv[optind++]); if (zip_stat_index(z, index, flags, &sb) < 0) { - fprintf(stderr, "%s: zip_stat_index failed on `%d' failed: %s\n", + fprintf(stderr, "%s: zip_stat_index failed on '%d' failed: %s\n", prg, index, zip_strerror(z)); return 1; } if (sb.valid & ZIP_STAT_NAME) - printf("name: `%s'\n", sb.name); + printf("name: '%s'\n", sb.name); if (sb.valid & ZIP_STAT_INDEX) - printf("index: `%"PRIu64"'\n", sb.index); + printf("index: '%"PRIu64"'\n", sb.index); if (sb.valid & ZIP_STAT_SIZE) - printf("size: `%"PRIu64"'\n", sb.size); + printf("size: '%"PRIu64"'\n", sb.size); if (sb.valid & ZIP_STAT_COMP_SIZE) - printf("compressed size: `%"PRIu64"'\n", sb.comp_size); + printf("compressed size: '%"PRIu64"'\n", sb.comp_size); if (sb.valid & ZIP_STAT_MTIME) { struct tm *tpm; tpm = localtime(&sb.mtime); strftime(buf, sizeof(buf), "%a %b %d %Y %T", tpm); - printf("mtime: `%s'\n", buf); + printf("mtime: '%s'\n", buf); } if (sb.valid & ZIP_STAT_CRC) - printf("crc: `%0x'\n", sb.crc); + printf("crc: '%0x'\n", sb.crc); if (sb.valid & ZIP_STAT_COMP_METHOD) - printf("compression method: `%d'\n", sb.comp_method); + printf("compression method: '%d'\n", sb.comp_method); if (sb.valid & ZIP_STAT_ENCRYPTION_METHOD) - printf("encryption method: `%d'\n", sb.encryption_method); + printf("encryption method: '%d'\n", sb.encryption_method); if (sb.valid & ZIP_STAT_FLAGS) - printf("flags: `%ld'\n", (long)sb.flags); + printf("flags: '%ld'\n", (long)sb.flags); printf("\n"); } if (zip_close(z) == -1) { - fprintf(stderr, "%s: can't close zip archive `%s': %s\n", prg, fname, zip_strerror(z)); + fprintf(stderr, "%s: can't close zip archive '%s': %s\n", prg, fname, zip_strerror(z)); return 1; }
diff --git a/regress/stat_index_cp437_guess.test b/regress/stat_index_cp437_guess.test index cca76ea..f445b6a 100644 --- a/regress/stat_index_cp437_guess.test +++ b/regress/stat_index_cp437_guess.test
@@ -3,147 +3,147 @@ args test-cp437.zip 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 return 0 file test-cp437.zip test-cp437.zip test-cp437.zip -stdout name: `☺☻♥♦♣♠•○◘◙♂♀♪♫☼►' -stdout index: `0' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:51:50' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '☺☻♥♦♣♠•○◘◙♂♀♪♫☼►' +stdout index: '0' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:51:50' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `◄↕‼¶§▬↨↑↓→←∟↔▲▼ ' -stdout index: `1' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:51:54' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '◄↕‼¶§▬↨↑↓→←∟↔▲▼ ' +stdout index: '1' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:51:54' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `!"#$%&'()*+,-./0' -stdout index: `2' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:51:58' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '!"#$%&'()*+,-./0' +stdout index: '2' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:51:58' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `123456789:;<=>?@' -stdout index: `3' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:04' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '123456789:;<=>?@' +stdout index: '3' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:04' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `ABCDEFGHIJKLMNOP' -stdout index: `4' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:08' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'ABCDEFGHIJKLMNOP' +stdout index: '4' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:08' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `QRSTUVWXYZ[\\]^_`' -stdout index: `5' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:12' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'QRSTUVWXYZ[\\]^_`' +stdout index: '5' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:12' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `abcdefghijklmnop' -stdout index: `6' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:18' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'abcdefghijklmnop' +stdout index: '6' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:18' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `qrstuvwxyz{|}~~Ç' -stdout index: `7' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:22' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'qrstuvwxyz{|}~~Ç' +stdout index: '7' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:22' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `üéâäàåçêëèïîìÄÅÉ' -stdout index: `8' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:26' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'üéâäàåçêëèïîìÄÅÉ' +stdout index: '8' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:26' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `æÆôöòûùÿÖÜ¢£¥₧ƒá' -stdout index: `9' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:30' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'æÆôöòûùÿÖÜ¢£¥₧ƒá' +stdout index: '9' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:30' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `íóúñѪº¿⌐¬½¼¡«»░' -stdout index: `10' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:36' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'íóúñѪº¿⌐¬½¼¡«»░' +stdout index: '10' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:36' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `▒▓│┤╡╢╖╕╣║╗╝╜╛┐└' -stdout index: `11' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:40' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '▒▓│┤╡╢╖╕╣║╗╝╜╛┐└' +stdout index: '11' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:40' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `┴┬├─┼╞╟╚╔╩╦╠═╬╧╨' -stdout index: `12' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:44' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '┴┬├─┼╞╟╚╔╩╦╠═╬╧╨' +stdout index: '12' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:44' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `╤╥╙╘╒╓╫╪┘┌█▄▌▐▀α' -stdout index: `13' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:50' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '╤╥╙╘╒╓╫╪┘┌█▄▌▐▀α' +stdout index: '13' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:50' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `ßΓπΣσµτΦΘΩδ∞φε∩≡' -stdout index: `14' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:54' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'ßΓπΣσµτΦΘΩδ∞φε∩≡' +stdout index: '14' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:54' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `±≥≤⌠⌡÷≈°∙·√ⁿ²■ ' -stdout index: `15' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:53:02' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '±≥≤⌠⌡÷≈°∙·√ⁿ²■ ' +stdout index: '15' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:53:02' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout
diff --git a/regress/stat_index_cp437_raw.test b/regress/stat_index_cp437_raw.test index 91a9de7..a746835 100644 --- a/regress/stat_index_cp437_raw.test +++ b/regress/stat_index_cp437_raw.test Binary files differ
diff --git a/regress/stat_index_cp437_strict.test b/regress/stat_index_cp437_strict.test index 310231b..ff99825 100644 --- a/regress/stat_index_cp437_strict.test +++ b/regress/stat_index_cp437_strict.test
@@ -3,147 +3,147 @@ args -s test-cp437.zip 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 return 0 file test-cp437.zip test-cp437.zip test-cp437.zip -stdout name: `☺☻♥♦♣♠•○◘◙♂♀♪♫☼►' -stdout index: `0' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:51:50' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '☺☻♥♦♣♠•○◘◙♂♀♪♫☼►' +stdout index: '0' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:51:50' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `◄↕‼¶§▬↨↑↓→←∟↔▲▼ ' -stdout index: `1' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:51:54' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '◄↕‼¶§▬↨↑↓→←∟↔▲▼ ' +stdout index: '1' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:51:54' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `!"#$%&'()*+,-./0' -stdout index: `2' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:51:58' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '!"#$%&'()*+,-./0' +stdout index: '2' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:51:58' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `123456789:;<=>?@' -stdout index: `3' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:04' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '123456789:;<=>?@' +stdout index: '3' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:04' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `ABCDEFGHIJKLMNOP' -stdout index: `4' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:08' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'ABCDEFGHIJKLMNOP' +stdout index: '4' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:08' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `QRSTUVWXYZ[\\]^_`' -stdout index: `5' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:12' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'QRSTUVWXYZ[\\]^_`' +stdout index: '5' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:12' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `abcdefghijklmnop' -stdout index: `6' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:18' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'abcdefghijklmnop' +stdout index: '6' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:18' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `qrstuvwxyz{|}~~Ç' -stdout index: `7' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:22' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'qrstuvwxyz{|}~~Ç' +stdout index: '7' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:22' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `üéâäàåçêëèïîìÄÅÉ' -stdout index: `8' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:26' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'üéâäàåçêëèïîìÄÅÉ' +stdout index: '8' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:26' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `æÆôöòûùÿÖÜ¢£¥₧ƒá' -stdout index: `9' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:30' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'æÆôöòûùÿÖÜ¢£¥₧ƒá' +stdout index: '9' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:30' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `íóúñѪº¿⌐¬½¼¡«»░' -stdout index: `10' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:36' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'íóúñѪº¿⌐¬½¼¡«»░' +stdout index: '10' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:36' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `▒▓│┤╡╢╖╕╣║╗╝╜╛┐└' -stdout index: `11' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:40' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '▒▓│┤╡╢╖╕╣║╗╝╜╛┐└' +stdout index: '11' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:40' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `┴┬├─┼╞╟╚╔╩╦╠═╬╧╨' -stdout index: `12' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:44' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '┴┬├─┼╞╟╚╔╩╦╠═╬╧╨' +stdout index: '12' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:44' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `╤╥╙╘╒╓╫╪┘┌█▄▌▐▀α' -stdout index: `13' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:50' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '╤╥╙╘╒╓╫╪┘┌█▄▌▐▀α' +stdout index: '13' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:50' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `ßΓπΣσµτΦΘΩδ∞φε∩≡' -stdout index: `14' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:52:54' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'ßΓπΣσµτΦΘΩδ∞φε∩≡' +stdout index: '14' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:52:54' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `±≥≤⌠⌡÷≈°∙·√ⁿ²■ ' -stdout index: `15' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Fri Feb 17 2012 20:53:02' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: '±≥≤⌠⌡÷≈°∙·√ⁿ²■ ' +stdout index: '15' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Fri Feb 17 2012 20:53:02' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout
diff --git a/regress/stat_index_fileorder.test b/regress/stat_index_fileorder.test index 912357a..4182c04 100644 --- a/regress/stat_index_fileorder.test +++ b/regress/stat_index_fileorder.test
@@ -3,21 +3,21 @@ args fileorder.zzip 0 1 return 0 file fileorder.zzip fileorder.zip fileorder.zip -stdout name: `file1' -stdout index: `0' -stdout size: `5' -stdout compressed size: `5' -stdout mtime: `Fri Apr 27 2012 23:21:42' -stdout crc: `9ee760e5' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'file1' +stdout index: '0' +stdout size: '5' +stdout compressed size: '5' +stdout mtime: 'Fri Apr 27 2012 23:21:42' +stdout crc: '9ee760e5' +stdout compression method: '0' +stdout encryption method: '0' stdout -stdout name: `file2' -stdout index: `1' -stdout size: `5' -stdout compressed size: `5' -stdout mtime: `Fri Apr 27 2012 23:21:44' -stdout crc: `7ee315f' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'file2' +stdout index: '1' +stdout size: '5' +stdout compressed size: '5' +stdout mtime: 'Fri Apr 27 2012 23:21:44' +stdout crc: '7ee315f' +stdout compression method: '0' +stdout encryption method: '0' stdout
diff --git a/regress/stat_index_streamed.test b/regress/stat_index_streamed.test index 52b5d00..9c0c73b 100644 --- a/regress/stat_index_streamed.test +++ b/regress/stat_index_streamed.test
@@ -3,12 +3,12 @@ args streamed 0 file streamed streamed.zip streamed.zip return 0 -stdout name: `-' -stdout index: `0' -stdout size: `2' -stdout compressed size: `4' -stdout mtime: `Wed Apr 25 2012 10:20:38' -stdout crc: `ddeaa107' -stdout compression method: `8' -stdout encryption method: `0' +stdout name: '-' +stdout index: '0' +stdout size: '2' +stdout compressed size: '4' +stdout mtime: 'Wed Apr 25 2012 10:20:38' +stdout crc: 'ddeaa107' +stdout compression method: '8' +stdout encryption method: '0' stdout
diff --git a/regress/stat_index_streamed_zip64.test b/regress/stat_index_streamed_zip64.test index e2f8a7c..d243987 100644 --- a/regress/stat_index_streamed_zip64.test +++ b/regress/stat_index_streamed_zip64.test
@@ -3,12 +3,12 @@ args streamed 0 file streamed streamed-zip64.zip streamed-zip64.zip return 0 -stdout name: `-' -stdout index: `0' -stdout size: `2' -stdout compressed size: `4' -stdout mtime: `Wed Apr 25 2012 10:20:38' -stdout crc: `ddeaa107' -stdout compression method: `8' -stdout encryption method: `0' +stdout name: '-' +stdout index: '0' +stdout size: '2' +stdout compressed size: '4' +stdout mtime: 'Wed Apr 25 2012 10:20:38' +stdout crc: 'ddeaa107' +stdout compression method: '8' +stdout encryption method: '0' stdout
diff --git a/regress/stat_index_utf8_guess.test b/regress/stat_index_utf8_guess.test index a20baea..9964e6c 100644 --- a/regress/stat_index_utf8_guess.test +++ b/regress/stat_index_utf8_guess.test
@@ -3,12 +3,12 @@ args test-utf8.zip 0 return 0 file test-utf8.zip test-utf8.zip test-utf8.zip -stdout name: `ÄÖÜäöüßćçĉéèêëē' -stdout index: `0' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Sat Feb 18 2012 00:15:08' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'ÄÖÜäöüßćçĉéèêëē' +stdout index: '0' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Sat Feb 18 2012 00:15:08' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout
diff --git a/regress/stat_index_utf8_raw.test b/regress/stat_index_utf8_raw.test index dcbaa8c..2ded8fc 100644 --- a/regress/stat_index_utf8_raw.test +++ b/regress/stat_index_utf8_raw.test
@@ -3,12 +3,12 @@ args -r test-utf8.zip 0 return 0 file test-utf8.zip test-utf8.zip test-utf8.zip -stdout name: `ÄÖÜäöüßćçĉéèêëē' -stdout index: `0' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Sat Feb 18 2012 00:15:08' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'ÄÖÜäöüßćçĉéèêëē' +stdout index: '0' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Sat Feb 18 2012 00:15:08' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout
diff --git a/regress/stat_index_utf8_strict.test b/regress/stat_index_utf8_strict.test index 6608516..87eb03e 100644 --- a/regress/stat_index_utf8_strict.test +++ b/regress/stat_index_utf8_strict.test
@@ -4,12 +4,12 @@ args -s test-utf8.zip 0 return 0 file test-utf8.zip test-utf8.zip test-utf8.zip -stdout name: `ÄÖÜäöüßćçĉéèêëē' -stdout index: `0' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Sat Feb 18 2012 00:15:08' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'ÄÖÜäöüßćçĉéèêëē' +stdout index: '0' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Sat Feb 18 2012 00:15:08' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout
diff --git a/regress/stat_index_utf8_unmarked_strict.test b/regress/stat_index_utf8_unmarked_strict.test index 795bf97..be783d8 100644 --- a/regress/stat_index_utf8_unmarked_strict.test +++ b/regress/stat_index_utf8_unmarked_strict.test
@@ -4,12 +4,12 @@ args -s test-utf8-unmarked.zip 0 return 0 file test-utf8-unmarked.zip test-utf8-unmarked.zip test-utf8-unmarked.zip -stdout name: `ÄÖÜäöüßćçĉéèêëē' -stdout index: `0' -stdout size: `0' -stdout compressed size: `0' -stdout mtime: `Sat Feb 18 2012 00:15:08' -stdout crc: `0' -stdout compression method: `0' -stdout encryption method: `0' +stdout name: 'ÄÖÜäöüßćçĉéèêëē' +stdout index: '0' +stdout size: '0' +stdout compressed size: '0' +stdout mtime: 'Sat Feb 18 2012 00:15:08' +stdout crc: '0' +stdout compression method: '0' +stdout encryption method: '0' stdout
diff --git a/regress/stat_index_zip64.test b/regress/stat_index_zip64.test index e472410..68e07b1 100644 --- a/regress/stat_index_zip64.test +++ b/regress/stat_index_zip64.test
@@ -3,12 +3,12 @@ args bigzero 0 file bigzero bigzero.zip bigzero.zip return 0 -stdout name: `bigzero' -stdout index: `0' -stdout size: `4294967296' -stdout compressed size: `4168157' -stdout mtime: `Thu Mar 15 2012 14:54:06' -stdout crc: `d202ef8d' -stdout compression method: `8' -stdout encryption method: `0' +stdout name: 'bigzero' +stdout index: '0' +stdout size: '4294967296' +stdout compressed size: '4168157' +stdout mtime: 'Thu Mar 15 2012 14:54:06' +stdout crc: 'd202ef8d' +stdout compression method: '8' +stdout encryption method: '0' stdout
diff --git a/regress/tryopen.c b/regress/tryopen.c index 7d44fe4..2fb5a96 100644 --- a/regress/tryopen.c +++ b/regress/tryopen.c
@@ -95,12 +95,12 @@ if ((z=zip_open(fname, flags, &ze)) != NULL) { count = zip_get_num_entries(z, 0); - printf("opening `%s' succeeded, %"PRIu64" entries\n", fname, count); + printf("opening '%s' succeeded, %"PRIu64" entries\n", fname, count); zip_close(z); continue; } - printf("opening `%s' returned error %d", fname, ze); + printf("opening '%s' returned error %d", fname, ze); if (zip_error_get_sys_type(ze) == ZIP_ET_SYS) printf("/%d", errno); printf("\n");
diff --git a/src/zipcmp.c b/src/zipcmp.c index 3a44245..17f1d14 100644 --- a/src/zipcmp.c +++ b/src/zipcmp.c
@@ -199,7 +199,7 @@ for (i=0; i<2; i++) { if ((za=zip_open(zn[i], paranoid ? ZIP_CHECKCONS : 0, &err)) == NULL) { zip_error_to_str(errstr, sizeof(errstr), err, errno); - fprintf(stderr, "%s: cannot open zip archive `%s': %s\n", + fprintf(stderr, "%s: cannot open zip archive '%s': %s\n", prg, zn[i], errstr); return -1; }
diff --git a/src/zipmerge.c b/src/zipmerge.c index 950c398..f13ac5b 100644 --- a/src/zipmerge.c +++ b/src/zipmerge.c
@@ -158,7 +158,7 @@ if ((za=zip_open(tname, ZIP_CREATE, &err)) == NULL) { zip_error_to_str(errstr, sizeof(errstr), err, errno); - fprintf(stderr, "%s: cannot open zip archive `%s': %s\n", + fprintf(stderr, "%s: cannot open zip archive '%s': %s\n", prg, tname, errstr); exit(1); } @@ -169,7 +169,7 @@ } if (zip_close(za) < 0) { - fprintf(stderr, "%s: cannot write zip archive `%s': %s\n", + fprintf(stderr, "%s: cannot write zip archive '%s': %s\n", prg, tname, zip_strerror(za)); exit(1); } @@ -195,12 +195,12 @@ return 0; if (zip_stat_index(za, it, ZIP_FL_UNCHANGED, &st) < 0) { - fprintf(stderr, "%s: cannot stat file %"PRIu64" in `%s': %s\n", + fprintf(stderr, "%s: cannot stat file %"PRIu64" in '%s': %s\n", prg, it, tname, zip_strerror(za)); return -1; } if (zip_stat_index(zs, is, 0, &ss) < 0) { - fprintf(stderr, "%s: cannot stat file %"PRIu64" in `%s': %s\n", + fprintf(stderr, "%s: cannot stat file %"PRIu64" in '%s': %s\n", prg, is, sname, zip_strerror(zs)); return -1; } @@ -212,8 +212,8 @@ return 0; } - printf("replace `%s' (%"PRIu64" / %08x) in `%s'\n" - " with `%s' (%"PRIu64" / %08x) from `%s'? ", + printf("replace '%s' (%"PRIu64" / %08x) in `%s'\n" + " with '%s' (%"PRIu64" / %08x) from `%s'? ", st.name, st.size, st.crc, tname, ss.name, ss.size, ss.crc, sname); fflush(stdout); @@ -245,14 +245,14 @@ if ((zs=zip_open(sname, 0, &err)) == NULL) { zip_error_to_str(errstr, sizeof(errstr), err, errno); - fprintf(stderr, "%s: cannot open zip archive `%s': %s\n", + fprintf(stderr, "%s: cannot open zip archive '%s': %s\n", prg, sname, errstr); return NULL; } ret = zip_get_num_entries(zs, 0); if (ret < 0) { - fprintf(stderr, "%s: cannot get number of entries for `%s': %s\n", prg, sname, zip_strerror(za)); + fprintf(stderr, "%s: cannot get number of entries for '%s': %s\n", prg, sname, zip_strerror(za)); return NULL; } for (i=0; i<(zip_uint64_t)ret; i++) { @@ -268,7 +268,7 @@ || zip_replace(za, (zip_uint64_t)idx, source) < 0) { zip_source_free(source); fprintf(stderr, - "%s: cannot replace `%s' in `%s': %s\n", + "%s: cannot replace '%s' in `%s': %s\n", prg, fname, tname, zip_strerror(za)); zip_close(zs); return NULL; @@ -292,7 +292,7 @@ || zip_add(za, fname, source) < 0) { zip_source_free(source); fprintf(stderr, - "%s: cannot add `%s' to `%s': %s\n", + "%s: cannot add '%s' to `%s': %s\n", prg, fname, tname, zip_strerror(za)); zip_close(zs); return NULL;
diff --git a/src/ziptorrent.c b/src/ziptorrent.c index 17b4b12..87dcd3b 100644 --- a/src/ziptorrent.c +++ b/src/ziptorrent.c
@@ -139,7 +139,7 @@ if ((za=zip_open(fname, 0, &err)) == NULL) { zip_error_to_str(errstr, sizeof(errstr), err, errno); - fprintf(stderr, "%s: cannot open zip archive `%s': %s\n", + fprintf(stderr, "%s: cannot open zip archive '%s': %s\n", prg, fname, errstr); return -1; } @@ -153,7 +153,7 @@ if ((flags & FLAG_DRYRUN) == 0) { if (zip_set_archive_flag(za, ZIP_AFL_TORRENT, 1) < 0) { - fprintf(stderr, "%s: cannot set torrentzip flag in `%s': %s\n", + fprintf(stderr, "%s: cannot set torrentzip flag in '%s': %s\n", prg, fname, zip_strerror(za)); zip_close(za); return -1; @@ -161,7 +161,7 @@ } if (zip_close(za) < 0) { - fprintf(stderr, "%s: cannot torrentzip `%s': %s\n", + fprintf(stderr, "%s: cannot torrentzip '%s': %s\n", prg, fname, zip_strerror(za)); zip_unchange_all(za); zip_close(za);