Simplify calling of CR/LF conversion routines

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-apply.c b/builtin-apply.c
index fd92ef7174dae1586921ebd34233c93b381106de..ccd342c1c46a7c7a1e346950f60f357426e58104 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -1475,8 +1475,8 @@ static int read_old_data(struct stat *st, const char *path, char **buf_p, unsign
                }
                close(fd);
                nsize = got;
                }
                close(fd);
                nsize = got;

-               nbuf = buf;
-               if (convert_to_git(path, &nbuf, &nsize)) {
+               nbuf = convert_to_git(path, buf, &nsize);
+               if (nbuf) {

                        free(buf);
                        *buf_p = nbuf;
                        *alloc_p = nsize;
                        free(buf);
                        *buf_p = nbuf;
                        *alloc_p = nsize;


@@ -2355,9 +2355,8 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned
 
 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
 {
 
 static int try_create_file(const char *path, unsigned int mode, const char *buf, unsigned long size)
 {

-       int fd, converted;
+       int fd;

        char *nbuf;
        char *nbuf;

-       unsigned long nsize;

 
        if (has_symlinks && S_ISLNK(mode))
                /* Although buf:size is counted string, it also is NUL
 
        if (has_symlinks && S_ISLNK(mode))
                /* Although buf:size is counted string, it also is NUL


@@ -2369,13 +2368,10 @@ static int try_create_file(const char *path, unsigned int mode, const char *buf,
        if (fd < 0)
                return -1;
 
        if (fd < 0)
                return -1;
 

-       nsize = size;
-       nbuf = (char *) buf;
-       converted = convert_to_working_tree(path, &nbuf, &nsize);
-       if (converted) {
+       nbuf = convert_to_working_tree(path, buf, &size);
+       if (nbuf)

                buf = nbuf;
                buf = nbuf;

-               size = nsize;
-       }
+

        while (size) {
                int written = xwrite(fd, buf, size);
                if (written < 0)
        while (size) {
                int written = xwrite(fd, buf, size);
                if (written < 0)


@@ -2387,7 +2383,7 @@ static int try_create_file(const char *path, unsigned int mode, const char *buf,
        }
        if (close(fd) < 0)
                die("closing file %s: %s", path, strerror(errno));
        }
        if (close(fd) < 0)
                die("closing file %s: %s", path, strerror(errno));

-       if (converted)
+       if (nbuf)

                free(nbuf);
        return 0;
 }
                free(nbuf);
        return 0;
 }

diff --git a/cache.h b/cache.h
index 38ad00661d5e0f5cc9f0d959c4c65c8c1ed238d9..8c804cb6eea5c3152b3f7e0a2cf7b4ada274280e 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -496,8 +496,8 @@ extern void trace_printf(const char *format, ...);
 extern void trace_argv_printf(const char **argv, int count, const char *format, ...);
 
 /* convert.c */
 extern void trace_argv_printf(const char **argv, int count, const char *format, ...);
 
 /* convert.c */

-extern int convert_to_git(const char *path, char **bufp, unsigned long *sizep);
-extern int convert_to_working_tree(const char *path, char **bufp, unsigned long *sizep);
+extern char *convert_to_git(const char *path, const char *src, unsigned long *sizep);
+extern char *convert_to_working_tree(const char *path, const char *src, unsigned long *sizep);

 
 /* match-trees.c */
 void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int);
 
 /* match-trees.c */
 void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int);

diff --git a/convert.c b/convert.c
index da64253a16e51881decd3e31d5763892f4847e5f..742b895cfa110e112673bf6aefd822d6adf66382 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -79,25 +79,24 @@ static int is_binary(unsigned long size, struct text_stat *stats)
        return 0;
 }
 
        return 0;
 }
 

-static int crlf_to_git(const char *path, char **bufp, unsigned long *sizep, int action)
+static char *crlf_to_git(const char *path, const char *src, unsigned long *sizep, int action)

 {
 {

-       char *buffer, *nbuf;
+       char *buffer, *dst;

        unsigned long size, nsize;
        struct text_stat stats;
 
        if ((action == CRLF_BINARY) || (action == CRLF_GUESS && !auto_crlf))
        unsigned long size, nsize;
        struct text_stat stats;
 
        if ((action == CRLF_BINARY) || (action == CRLF_GUESS && !auto_crlf))

-               return 0;
+               return NULL;

 
        size = *sizep;
        if (!size)
 
        size = *sizep;
        if (!size)

-               return 0;
-       buffer = *bufp;
+               return NULL;

 
 

-       gather_stats(buffer, size, &stats);
+       gather_stats(src, size, &stats);

 
        /* No CR? Nothing to convert, regardless. */
        if (!stats.cr)
 
        /* No CR? Nothing to convert, regardless. */
        if (!stats.cr)

-               return 0;
+               return NULL;

 
        if (action == CRLF_GUESS) {
                /*
 
        if (action == CRLF_GUESS) {
                /*


@@ -106,13 +105,13 @@ static int crlf_to_git(const char *path, char **bufp, unsigned long *sizep, int
                 * stuff?
                 */
                if (stats.cr != stats.crlf)
                 * stuff?
                 */
                if (stats.cr != stats.crlf)

-                       return 0;
+                       return NULL;

 
                /*
                 * And add some heuristics for binary vs text, of course...
                 */
                if (is_binary(size, &stats))
 
                /*
                 * And add some heuristics for binary vs text, of course...
                 */
                if (is_binary(size, &stats))

-                       return 0;
+                       return NULL;

        }
 
        /*
        }
 
        /*


@@ -120,10 +119,10 @@ static int crlf_to_git(const char *path, char **bufp, unsigned long *sizep, int
         * to let the caller know that we switched buffers on it.
         */
        nsize = size - stats.crlf;
         * to let the caller know that we switched buffers on it.
         */
        nsize = size - stats.crlf;

-       nbuf = xmalloc(nsize);
-       *bufp = nbuf;
+       buffer = xmalloc(nsize);

        *sizep = nsize;
 
        *sizep = nsize;
 

+       dst = buffer;

        if (action == CRLF_GUESS) {
                /*
                 * If we guessed, we already know we rejected a file with
        if (action == CRLF_GUESS) {
                /*
                 * If we guessed, we already know we rejected a file with


@@ -131,54 +130,53 @@ static int crlf_to_git(const char *path, char **bufp, unsigned long *sizep, int
                 * follow it.
                 */
                do {
                 * follow it.
                 */
                do {

-                       unsigned char c = *buffer++;
+                       unsigned char c = *src++;

                        if (c != '\r')
                        if (c != '\r')

-                               *nbuf++ = c;
+                               *dst++ = c;

                } while (--size);
        } else {
                do {
                } while (--size);
        } else {
                do {

-                       unsigned char c = *buffer++;
+                       unsigned char c = *src++;

                        if (! (c == '\r' && (1 < size && *buffer == '\n')))
                        if (! (c == '\r' && (1 < size && *buffer == '\n')))

-                               *nbuf++ = c;
+                               *dst++ = c;

                } while (--size);
        }
 
                } while (--size);
        }
 

-       return 1;
+       return buffer;

 }
 
 }
 

-static int crlf_to_worktree(const char *path, char **bufp, unsigned long *sizep, int action)
+static char *crlf_to_worktree(const char *path, const char *src, unsigned long *sizep, int action)

 {
 {

-       char *buffer, *nbuf;
+       char *buffer, *dst;

        unsigned long size, nsize;
        struct text_stat stats;
        unsigned char last;
 
        if ((action == CRLF_BINARY) || (action == CRLF_INPUT) ||
            (action == CRLF_GUESS && auto_crlf <= 0))
        unsigned long size, nsize;
        struct text_stat stats;
        unsigned char last;
 
        if ((action == CRLF_BINARY) || (action == CRLF_INPUT) ||
            (action == CRLF_GUESS && auto_crlf <= 0))

-               return 0;
+               return NULL;

 
        size = *sizep;
        if (!size)
 
        size = *sizep;
        if (!size)

-               return 0;
-       buffer = *bufp;
+               return NULL;

 
 

-       gather_stats(buffer, size, &stats);
+       gather_stats(src, size, &stats);

 
        /* No LF? Nothing to convert, regardless. */
        if (!stats.lf)
 
        /* No LF? Nothing to convert, regardless. */
        if (!stats.lf)

-               return 0;
+               return NULL;

 
        /* Was it already in CRLF format? */
        if (stats.lf == stats.crlf)
 
        /* Was it already in CRLF format? */
        if (stats.lf == stats.crlf)

-               return 0;
+               return NULL;

 
        if (action == CRLF_GUESS) {
                /* If we have any bare CR characters, we're not going to touch it */
                if (stats.cr != stats.crlf)
 
        if (action == CRLF_GUESS) {
                /* If we have any bare CR characters, we're not going to touch it */
                if (stats.cr != stats.crlf)

-                       return 0;
+                       return NULL;

 
                if (is_binary(size, &stats))
 
                if (is_binary(size, &stats))

-                       return 0;
+                       return NULL;

        }
 
        /*
        }
 
        /*


@@ -186,19 +184,20 @@ static int crlf_to_worktree(const char *path, char **bufp, unsigned long *sizep,
         * to let the caller know that we switched buffers on it.
         */
        nsize = size + stats.lf - stats.crlf;
         * to let the caller know that we switched buffers on it.
         */
        nsize = size + stats.lf - stats.crlf;

-       nbuf = xmalloc(nsize);
-       *bufp = nbuf;
+       buffer = xmalloc(nsize);

        *sizep = nsize;
        last = 0;
        *sizep = nsize;
        last = 0;

+
+       dst = buffer;

        do {
        do {

-               unsigned char c = *buffer++;
+               unsigned char c = *src++;

                if (c == '\n' && last != '\r')
                if (c == '\n' && last != '\r')

-                       *nbuf++ = '\r';
-               *nbuf++ = c;
+                       *dst++ = '\r';
+               *dst++ = c;

                last = c;
        } while (--size);
 
                last = c;
        } while (--size);
 

-       return 1;
+       return buffer;

 }
 
 static void setup_crlf_check(struct git_attr_check *check)
 }
 
 static void setup_crlf_check(struct git_attr_check *check)


@@ -231,12 +230,12 @@ static int git_path_check_crlf(const char *path)
        return CRLF_GUESS;
 }
 
        return CRLF_GUESS;
 }
 

-int convert_to_git(const char *path, char **bufp, unsigned long *sizep)
+char *convert_to_git(const char *path, const char *src, unsigned long *sizep)

 {
 {

-       return crlf_to_git(path, bufp, sizep, git_path_check_crlf(path));
+       return crlf_to_git(path, src, sizep, git_path_check_crlf(path));

 }
 
 }
 

-int convert_to_working_tree(const char *path, char **bufp, unsigned long *sizep)
+char *convert_to_working_tree(const char *path, const char *src, unsigned long *sizep)

 {
 {

-       return crlf_to_worktree(path, bufp, sizep, git_path_check_crlf(path));
+       return crlf_to_worktree(path, src, sizep, git_path_check_crlf(path));

 }
 }

diff --git a/diff.c b/diff.c
index 5f501864e60899c7cdcaedeadaf996310a74be7b..1cb1230a9903e60f2596d934664dce18a1e82806 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1493,9 +1493,9 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
                /*
                 * Convert from working tree format to canonical git format
                 */
                /*
                 * Convert from working tree format to canonical git format
                 */

-               buf = s->data;

                size = s->size;
                size = s->size;

-               if (convert_to_git(s->path, &buf, &size)) {
+               buf = convert_to_git(s->path, s->data, &size);
+               if (buf) {

                        munmap(s->data, s->size);
                        s->should_munmap = 0;
                        s->data = buf;
                        munmap(s->data, s->size);
                        s->should_munmap = 0;
                        s->data = buf;

diff --git a/entry.c b/entry.c
index d72f811580ad10e792e38b40fe79bf4af3868846..3771209f1956f6aa3990e512187c8037e240c818 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -79,7 +79,6 @@ static int write_entry(struct cache_entry *ce, char *path, struct checkout *stat
        }
        switch (ntohl(ce->ce_mode) & S_IFMT) {
                char *buf;
        }
        switch (ntohl(ce->ce_mode) & S_IFMT) {
                char *buf;

-               unsigned long nsize;

 
        case S_IFREG:
                if (to_tempfile) {
 
        case S_IFREG:
                if (to_tempfile) {


@@ -96,12 +95,10 @@ static int write_entry(struct cache_entry *ce, char *path, struct checkout *stat
                /*
                 * Convert from git internal format to working tree format
                 */
                /*
                 * Convert from git internal format to working tree format
                 */

-               buf = new;
-               nsize = size;
-               if (convert_to_working_tree(ce->name, &buf, &nsize)) {
+               buf = convert_to_working_tree(ce->name, new, &size);
+               if (buf) {

                        free(new);
                        new = buf;
                        free(new);
                        new = buf;

-                       size = nsize;

                }
 
                wrote = write_in_full(fd, new, size);
                }
 
                wrote = write_in_full(fd, new, size);

diff --git a/sha1_file.c b/sha1_file.c
index 4304fe9bbc2b8e796e944fa7ddb2ea2791000adf..1978d5f14e71485527c80709ec6f625055d784eb 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2277,10 +2277,9 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object,
         */
        if ((type == OBJ_BLOB) && S_ISREG(st->st_mode)) {
                unsigned long nsize = size;
         */
        if ((type == OBJ_BLOB) && S_ISREG(st->st_mode)) {
                unsigned long nsize = size;

-               char *nbuf = buf;
-               if (convert_to_git(path, &nbuf, &nsize)) {
-                       if (size)
-                               munmap(buf, size);
+               char *nbuf = convert_to_git(path, buf, &nsize);
+               if (nbuf) {
+                       munmap(buf, size);

                        size = nsize;
                        buf = nbuf;
                        re_allocated = 1;
                        size = nsize;
                        buf = nbuf;
                        re_allocated = 1;