[PATCH] introduce xmalloc and xrealloc

diff --git a/commit-tree.c b/commit-tree.c
index 71fce3f357f2287acdeb0e6c62122f4b19e677af..23de13361944ad7ba7c5320cf7cdd04e81842c60 100644 (file)
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -12,19 +12,14 @@
 #include <time.h>
 
 #define BLOCKING (1ul << 14)
-#define ORIG_OFFSET (40)
 
 /*
- * Leave space at the beginning to insert the tag
- * once we know how big things are.
- *
  * FIXME! Share the code with "write-tree.c"
  */
 static void init_buffer(char **bufp, unsigned int *sizep)
 {
-       char *buf = malloc(BLOCKING);
-       memset(buf, 0, ORIG_OFFSET);
-       *sizep = ORIG_OFFSET;
+       char *buf = xmalloc(BLOCKING);
+       *sizep = 0;
        *bufp = buf;
 }
 
@@ -45,41 +40,13 @@ static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
        buf = *bufp;
        if (newsize > alloc) {
                alloc = (newsize + 32767) & ~32767;
-               buf = realloc(buf, alloc);
+               buf = xrealloc(buf, alloc);
                *bufp = buf;
        }
        *sizep = newsize;
        memcpy(buf + size, one_line, len);
 }
 
-static int prepend_integer(char *buffer, unsigned val, int i)
-{
-       buffer[--i] = '\0';
-       do {
-               buffer[--i] = '0' + (val % 10);
-               val /= 10;
-       } while (val);
-       return i;
-}
-
-static void finish_buffer(char *tag, char **bufp, unsigned int *sizep)
-{
-       int taglen;
-       int offset;
-       char *buf = *bufp;
-       unsigned int size = *sizep;
-
-       offset = prepend_integer(buf, size - ORIG_OFFSET, ORIG_OFFSET);
-       taglen = strlen(tag);
-       offset -= taglen;
-       buf += offset;
-       size -= offset;
-       memcpy(buf, tag, taglen);
-
-       *bufp = buf;
-       *sizep = size;
-}
-
 static void remove_special(char *p)
 {
        char c;
@@ -268,15 +235,13 @@ static void check_valid(unsigned char *sha1, const char *expect)
 }
 
 /*
- * Having more than two parents may be strange, but hey, there's
- * no conceptual reason why the file format couldn't accept multi-way
- * merges. It might be the "union" of several packages, for example.
- *
- * I don't really expect that to happen, but this is here to make
- * it clear that _conceptually_ it's ok..
+ * Having more than two parents is not strange at all, and this is
+ * how multi-way merges are represented.
  */
 #define MAXPARENT (16)
 
+static char *commit_tree_usage = "commit-tree <sha1> [-p <sha1>]* < changelog";
+
 int main(int argc, char **argv)
 {
        int i, len;
@@ -296,14 +261,14 @@ int main(int argc, char **argv)
        unsigned int size;
 
        if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
-               usage("commit-tree <sha1> [-p <sha1>]* < changelog");
+               usage(commit_tree_usage);
 
        check_valid(tree_sha1, "tree");
        for (i = 2; i < argc; i += 2) {
                char *a, *b;
                a = argv[i]; b = argv[i+1];
                if (!b || strcmp(a, "-p") || get_sha1_hex(b, parent_sha1[parents]))
-                       usage("commit-tree <sha1> [-p <sha1>]* < changelog");
+                       usage(commit_tree_usage);
                check_valid(parent_sha1[parents], "commit");
                parents++;
        }
@@ -317,8 +282,10 @@ int main(int argc, char **argv)
        memcpy(realemail, pw->pw_name, len);
        realemail[len] = '@';
        gethostname(realemail+len+1, sizeof(realemail)-len-1);
-       strcat(realemail, ".");
-       getdomainname(realemail+strlen(realemail), sizeof(realemail)-strlen(realemail)-1);
+       if (!strchr(realemail+len+1, '.')) {
+               strcat(realemail, ".");
+               getdomainname(realemail+strlen(realemail), sizeof(realemail)-strlen(realemail)-1);
+       }
        time(&now);
        tm = localtime(&now);
 
@@ -355,9 +322,7 @@ int main(int argc, char **argv)
        while (fgets(comment, sizeof(comment), stdin) != NULL)
                add_buffer(&buffer, &size, "%s", comment);
 
-       finish_buffer("commit ", &buffer, &size);
-
-       write_sha1_file(buffer, size, commit_sha1);
+       write_sha1_file(buffer, size, "commit", commit_sha1);
        printf("%s\n", sha1_to_hex(commit_sha1));
        return 0;
 }