Eliminate Scalar::Util usage from private-Error.pm

diff --git a/perl/Git.xs b/perl/Git.xs
index 8b06ebfae9e7b96c71a2fb03851d99b76ee88ec6..226dd4f681ae99bb5c53a4e63394161d92c6ff76 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)
@@ -58,10 +52,24 @@ BOOT:
 }
 
 
-# /* TODO: xs_call_gate(). See Git.pm. */
+void
+xs__call_gate(repoid, git_dir)
+       long repoid;
+       char *git_dir;
+CODE:
+{
+       static long last_repoid;
+       if (repoid != last_repoid) {
+               setup_git(git_dir,
+                         getenv(DB_ENVIRONMENT),
+                         getenv(INDEX_ENVIRONMENT),
+                         getenv(GRAFT_ENVIRONMENT));
+               last_repoid = repoid;
+       }
+}
 
 
-const char *
+char *
 xs_version()
 CODE:
 {
@@ -71,11 +79,11 @@ OUTPUT:
        RETVAL
 
 
-const char *
+char *
 xs_exec_path()
 CODE:
 {
-       RETVAL = git_exec_path();
+       RETVAL = (char *)git_exec_path();
 }
 OUTPUT:
        RETVAL
@@ -103,43 +111,61 @@ CODE:
        free((char **) argv);
 }
 
+
+SV *
+xs_get_object(type, id)
+       char *type;
+       char *id;
+CODE:
+{
+       unsigned char sha1[20];
+       unsigned long size;
+       void *buf;
+
+       if (strlen(id) != 40 || get_sha1_hex(id, sha1) < 0)
+               XSRETURN_UNDEF;
+
+       buf = read_sha1_file(sha1, type, &size);
+       if (!buf)
+               XSRETURN_UNDEF;
+       RETVAL = newSVpvn(buf, size);
+       free(buf);
+}
+OUTPUT:
+       RETVAL
+
+
 char *
-xs_hash_object(file, type = "blob")
-       SV *file;
+xs_hash_object_pipe(type, fd)
        char *type;
+       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: