Replace add_from_buffer with modify, now that runtest does backslash encoding.
diff --git a/.hgignore b/.hgignore
index c6e4c95..9b8a917 100644
--- a/.hgignore
+++ b/.hgignore
@@ -36,8 +36,6 @@
^missing$
^regress/.*log$
^regress/.*trs$
-^regress/add_dir$
-^regress/add_from_buffer$
^regress/add_from_filep$
^regress/bigzero.zip$
^regress/fopen_unchanged$
diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt
index f614266..98ae6cb 100644
--- a/regress/CMakeLists.txt
+++ b/regress/CMakeLists.txt
@@ -8,7 +8,6 @@
ENDIF(NOT HAVE_GETOPT)
SET(STANDALONE_TEST_PROGRAMS
- add_from_buffer
add_from_filep
fopen_unchanged
# fread
diff --git a/regress/Makefile.am b/regress/Makefile.am
index 99ed0a9..9f575c4 100644
--- a/regress/Makefile.am
+++ b/regress/Makefile.am
@@ -3,7 +3,6 @@
noinst_SCRIPTS= runtest
noinst_PROGRAMS= \
- add_from_buffer \
add_from_filep \
fopen_unchanged \
fread \
diff --git a/regress/add_from_buffer.c b/regress/add_from_buffer.c
deleted file mode 100644
index 5fad1ca..0000000
--- a/regress/add_from_buffer.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- add_from_buffer.c -- test case for adding file from buffer to archive
- Copyright (C) 1999-2014 Dieter Baron and Thomas Klausner
-
- This file is part of libzip, a library to manipulate ZIP archives.
- The authors can be contacted at <libzip@nih.at>
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
- 3. The names of the authors may not be used to endorse or promote
- products derived from this software without specific prior
- written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "zip.h"
-
-const char *teststr="This is a test, and it seems to have been successful.\n";
-const char *file="teststring.txt";
-const char *prg;
-
-int
-main(int argc, char *argv[])
-{
- const char *archive;
- zip_t *za;
- zip_source_t *zs;
- int err;
-
- prg = argv[0];
-
- if (argc != 2) {
- fprintf(stderr, "usage: %s archive\n", prg);
- return 1;
- }
-
- archive = argv[1];
-
- if ((za=zip_open(archive, ZIP_CREATE, &err)) == NULL) {
- zip_error_t error;
- zip_error_init_with_code(&error, err);
- fprintf(stderr, "%s: can't open zip archive '%s': %s\n", prg, archive, zip_error_strerror(&error));
- zip_error_fini(&error);
- return 1;
- }
-
- if ((zs=zip_source_buffer(za, teststr, strlen(teststr), 0)) == NULL) {
- fprintf(stderr, "%s: can't create zip_source from buffer: %s\n", prg,
- zip_strerror(za));
- exit(1);
- }
-
- if (zip_add(za, file, zs) == -1) {
- zip_source_free(zs);
- 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,
- archive, zip_strerror(za));
- return 1;
- }
-
- return 0;
-}
diff --git a/regress/add_from_buffer.test b/regress/add_from_buffer.test
index ff6c472..d0a1ebb 100644
--- a/regress/add_from_buffer.test
+++ b/regress/add_from_buffer.test
@@ -1,5 +1,5 @@
# add buffer contents as file to zip
-program add_from_buffer
+program modify
return 0
-args testbuffer.zip
+args testbuffer.zip add teststring.txt "This is a test, and it seems to have been successful.\n"
file-new testbuffer.zip testbuffer.zip
