strbuf_read_file enhancement, and use it.

* make strbuf_read_file take a size hint (works like strbuf_read)
* use it in a couple of places.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-apply.c b/builtin-apply.c
index 740623e6c09cbf85bd8d54aac560dc2c5015078b..fec96a8d9d24cafe492a8dbe40bdb470244ea9f5 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -1425,8 +1425,6 @@ static void show_stats(struct patch *patch)
 
 static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
 {
 
 static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
 {

-       int fd;
-

        switch (st->st_mode & S_IFMT) {
        case S_IFLNK:
                strbuf_grow(buf, st->st_size);
        switch (st->st_mode & S_IFMT) {
        case S_IFLNK:
                strbuf_grow(buf, st->st_size);


@@ -1435,14 +1433,8 @@ static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
                strbuf_setlen(buf, st->st_size);
                return 0;
        case S_IFREG:
                strbuf_setlen(buf, st->st_size);
                return 0;
        case S_IFREG:

-               fd = open(path, O_RDONLY);
-               if (fd < 0)
-                       return error("unable to open %s", path);
-               if (strbuf_read(buf, fd, st->st_size) < 0) {
-                       close(fd);
-                       return -1;
-               }
-               close(fd);
+               if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
+                       return error("unable to open or read %s", path);

                convert_to_git(path, buf->buf, buf->len, buf);
                return 0;
        default:
                convert_to_git(path, buf->buf, buf->len, buf);
                return 0;
        default:

diff --git a/builtin-blame.c b/builtin-blame.c
index 16c0ca82063b35651cacc56b20ebd73c3526acfb..e3112a2d5bb2158bcc189942090a936c3f2b7cf6 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2002,7 +2002,6 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con
        unsigned char head_sha1[20];
        struct strbuf buf;
        const char *ident;
        unsigned char head_sha1[20];
        struct strbuf buf;
        const char *ident;

-       int fd;

        time_t now;
        int size, len;
        struct cache_entry *ce;
        time_t now;
        int size, len;
        struct cache_entry *ce;


@@ -2041,11 +2040,8 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con
                mode = canon_mode(st.st_mode);
                switch (st.st_mode & S_IFMT) {
                case S_IFREG:
                mode = canon_mode(st.st_mode);
                switch (st.st_mode & S_IFMT) {
                case S_IFREG:

-                       fd = open(read_from, O_RDONLY);
-                       if (fd < 0)
-                               die("cannot open %s", read_from);
-                       if (strbuf_read(&buf, fd, 0) != xsize_t(st.st_size))
-                               die("cannot read %s", read_from);
+                       if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size)
+                               die("cannot open or read %s", read_from);

                        break;
                case S_IFLNK:
                        if (readlink(read_from, buf.buf, buf.alloc) != fin_size)
                        break;
                case S_IFLNK:
                        if (readlink(read_from, buf.buf, buf.alloc) != fin_size)

diff --git a/builtin-tag.c b/builtin-tag.c
index 6132cac21868ee5a563278bd0480c82ed9ca74e9..66e5a5830792471a44c9211d4eafcf2b1ff6f0dd 100644 (file)
--- a/builtin-tag.c
+++ b/builtin-tag.c
@@ -51,7 +51,7 @@ static void launch_editor(const char *path, struct strbuf *buffer)
        if (run_command(&child))
                die("There was a problem with the editor %s.", editor);
 
        if (run_command(&child))
                die("There was a problem with the editor %s.", editor);
 

-       if (strbuf_read_file(buffer, path) < 0)
+       if (strbuf_read_file(buffer, path, 0) < 0)

                die("could not read message file '%s': %s",
                    path, strerror(errno));
 }
                die("could not read message file '%s': %s",
                    path, strerror(errno));
 }


@@ -356,8 +356,6 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
                        continue;
                }
                if (!strcmp(arg, "-F")) {
                        continue;
                }
                if (!strcmp(arg, "-F")) {

-                       int fd;
-

                        annotate = 1;
                        i++;
                        if (i == argc)
                        annotate = 1;
                        i++;
                        if (i == argc)


@@ -365,17 +363,14 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
                        if (message)
                                die("only one -F or -m option is allowed.");
 
                        if (message)
                                die("only one -F or -m option is allowed.");
 

-                       if (!strcmp(argv[i], "-"))
-                               fd = 0;
-                       else {
-                               fd = open(argv[i], O_RDONLY);
-                               if (fd < 0)
-                                       die("could not open '%s': %s",
+                       if (!strcmp(argv[i], "-")) {
+                               if (strbuf_read(&buf, 0, 1024) < 0)
+                                       die("cannot read %s", argv[i]);
+                       } else {
+                               if (strbuf_read_file(&buf, argv[i], 1024) < 0)
+                                       die("could not open or read '%s': %s",

                                                argv[i], strerror(errno));
                        }
                                                argv[i], strerror(errno));
                        }

-                       if (strbuf_read(&buf, fd, 1024) < 0) {
-                               die("cannot read %s", argv[i]);
-                       }

                        message = 1;
                        continue;
                }
                        message = 1;
                        continue;
                }

diff --git a/strbuf.c b/strbuf.c
index 0e431daa6158108130b34c0b3a61f1875c70b023..f4201e160de2ccb9f2d9adef695c73a124e676d5 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -186,14 +186,14 @@ int strbuf_getline(struct strbuf *sb, FILE *fp, int term)
        return 0;
 }
 
        return 0;
 }
 

-int strbuf_read_file(struct strbuf *sb, const char *path)
+int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint)

 {
        int fd, len;
 
        fd = open(path, O_RDONLY);
        if (fd < 0)
                return -1;
 {
        int fd, len;
 
        fd = open(path, O_RDONLY);
        if (fd < 0)
                return -1;

-       len = strbuf_read(sb, fd, 0);
+       len = strbuf_read(sb, fd, hint);

        close(fd);
        if (len < 0)
                return -1;
        close(fd);
        if (len < 0)
                return -1;

diff --git a/strbuf.h b/strbuf.h
index 6deec78479ec9bf4c7dec0bcd4030534b887d92a..9b9e861d3d5e24477459eec1ab4007cfb35f52b9 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -108,7 +108,7 @@ extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...);
 extern size_t strbuf_fread(struct strbuf *, size_t, FILE *);
 /* XXX: if read fails, any partial read is undone */
 extern ssize_t strbuf_read(struct strbuf *, int fd, size_t hint);
 extern size_t strbuf_fread(struct strbuf *, size_t, FILE *);
 /* XXX: if read fails, any partial read is undone */
 extern ssize_t strbuf_read(struct strbuf *, int fd, size_t hint);

-extern int strbuf_read_file(struct strbuf *sb, const char *path);
+extern int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);

 
 extern int strbuf_getline(struct strbuf *, FILE *, int);
 
 
 extern int strbuf_getline(struct strbuf *, FILE *, int);