Convert rename tests to use modify. Remove "rename".

.hgignore

diff --git a/.hgignore b/.hgignore
index 2e62857..3a663a3 100644
--- a/.hgignore
+++ b/.hgignore
@@ -23,7 +23,6 @@
 ^regress/fread$
 ^regress/modify$
 ^regress/name_locate$
-^regress/rename$
 ^regress/set_comment_all$
 ^regress/set_comment_localonly$
 ^regress/set_comment_removeglobal$

regress/CMakeLists.txt

diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt
index a07d7a2..6250b54 100644
--- a/regress/CMakeLists.txt
+++ b/regress/CMakeLists.txt
@@ -14,7 +14,6 @@
 
 SET(HELPER_TEST_PROGRAMS
   modify
-  rename
   set_compression
   stat_index
   tryopen

regress/Makefile.am

diff --git a/regress/Makefile.am b/regress/Makefile.am
index 9cbd15d..939f7b3 100644
--- a/regress/Makefile.am
+++ b/regress/Makefile.am
@@ -5,7 +5,6 @@
 	fread \
 	modify \
 	name_locate \
-	rename \
 	set_comment_all \
 	set_comment_localonly \
 	set_comment_removeglobal \

regress/rename.c

diff --git a/regress/rename.c b/regress/rename.c
deleted file mode 100644
index 8b379cf..0000000
--- a/regress/rename.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-  rename.c -- test cases for renaming files in zip archives
-  Copyright (C) 2012 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 "zip.h"
-
-const char *prg;
-
-
-
-int
-main(int argc, char *argv[])
-{
-    zip_uint64_t idx;
-    int ze;
-    struct zip *z;
-    const char *archive;
-    const char *oldname;
-    const char *newname;
-
-    prg = argv[0];
-
-    if (argc != 4) {
-        fprintf(stderr, "usage: %s archive oldname newname\n", prg);
-        return 1;
-    }
-
-    archive = argv[1];
-    oldname = argv[2];
-    newname = argv[3];
-
-    if ((z=zip_open(archive, 0, &ze)) == NULL) {
-	char buf[100];
-	zip_error_to_str(buf, sizeof(buf), ze, errno);
-	printf("%s: can't open zip archive `%s': %s\n", prg,
-	       archive, buf);
-	return 1;
-    }
-
-    if ((idx=zip_name_locate(z, oldname, 0)) < 0) {
-	printf("%s: unexpected error while looking for `%s': %s\n",
-	       prg, oldname, zip_strerror(z));
-	return 1;
-    }
-
-    if (zip_rename(z, idx, newname) < 0) {
-	/* expected error, so no prg prefix */
-	printf("error renaming `%s' to `%s': %s\n",
-	       oldname, newname, zip_strerror(z));
-	return 1;
-    }
-
-    if (zip_close(z) == -1) {
-	fprintf(stderr, "%s: can't close zip archive `%s': %s\n", prg,
-		archive, zip_strerror(z));
-	return 1;
-    }
-
-    exit(0);
-}

regress/rename_fail.test

diff --git a/regress/rename_fail.test b/regress/rename_fail.test
index cd95c54..0fc2868 100644
--- a/regress/rename_fail.test
+++ b/regress/rename_fail.test
@@ -1,6 +1,6 @@
 # rename file inside zip archive, but file name already exists
-program rename
+program modify
 return 1
-args rename.zip file2 file4
+args rename.zip   rename 0 file4
 file rename.zip testcomment.zip testcomment.zip
-stdout error renaming `file2' to `file4': File already exists
+stderr can't rename file at index `0' to `file4': File already exists

regress/rename_ok.test

diff --git a/regress/rename_ok.test b/regress/rename_ok.test
index efff5c5..9d9871b 100644
--- a/regress/rename_ok.test
+++ b/regress/rename_ok.test
@@ -1,5 +1,5 @@
 # rename file inside zip archive
-program rename
+program modify
 return 0
-args rename.zip file2 notfile2
+args rename.zip  rename 1 notfile2
 file rename.zip testcomment.zip rename_ok.zip