Git.pm: Don't #define around die

diff --git a/perl/Git.xs b/perl/Git.xs
index 3030ba9ab55e05a6a0debc18e634e25c0a8e6ece..2bbec4365f9c244a7a905df702393bca591d9d67 100644 (file)
--- a/perl/Git.xs
+++ b/perl/Git.xs
@@ -8,17 +8,11 @@
 #include "../cache.h"
 #include "../exec_cmd.h"
 
-#define die perlyshadow_die__
-
 /* XS and Perl interface */
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 
-#include "ppport.h"
-
-#undef die
-
 
 static char *
 report_xs(const char *prefix, const char *err, va_list params)
@@ -61,7 +55,7 @@ BOOT:
 # /* TODO: xs_call_gate(). See Git.pm. */
 
 
-const char *
+char *
 xs_version()
 CODE:
 {
@@ -71,11 +65,11 @@ OUTPUT:
        RETVAL
 
 
-const char *
+char *
 xs_exec_path()
 CODE:
 {
-       RETVAL = git_exec_path();
+       RETVAL = (char *)git_exec_path();
 }
 OUTPUT:
        RETVAL
@@ -104,42 +98,36 @@ CODE:
 }
 
 char *
-xs_hash_object(type, file)
+xs_hash_object_pipe(type, fd)
        char *type;
-       SV *file;
+       int fd;
 CODE:
 {
        unsigned char sha1[20];
 
-       if (SvTYPE(file) == SVt_RV)
-               file = SvRV(file);
-
-       if (SvTYPE(file) == SVt_PVGV) {
-               /* Filehandle */
-               PerlIO *pio;
-
-               pio = IoIFP(sv_2io(file));
-               if (!pio)
-                       croak("You passed me something weird - a dir glob?");
-               /* XXX: I just hope PerlIO didn't read anything from it yet.
-                * --pasky */
-               if (index_pipe(sha1, PerlIO_fileno(pio), type, 0))
-                       croak("Unable to hash given filehandle");
-               /* Avoid any nasty surprises. */
-               PerlIO_close(pio);
-
-       } else {
-               /* String */
-               char *path = SvPV_nolen(file);
-               int fd = open(path, O_RDONLY);
-               struct stat st;
-
-               if (fd < 0 ||
-                   fstat(fd, &st) < 0 ||
-                   index_fd(sha1, fd, &st, 0, type))
-                       croak("Unable to hash %s", path);
-               close(fd);
-       }
+       if (index_pipe(sha1, fd, type, 0))
+               croak("Unable to hash given filehandle");
+       RETVAL = sha1_to_hex(sha1);
+}
+OUTPUT:
+       RETVAL
+
+char *
+xs_hash_object_file(type, path)
+       char *type;
+       char *path;
+CODE:
+{
+       unsigned char sha1[20];
+       int fd = open(path, O_RDONLY);
+       struct stat st;
+
+       if (fd < 0 ||
+           fstat(fd, &st) < 0 ||
+           index_fd(sha1, fd, &st, 0, type))
+               croak("Unable to hash %s", path);
+       close(fd);
+
        RETVAL = sha1_to_hex(sha1);
 }
 OUTPUT: