Replace all read_fd use with strbuf_read, and get rid of it.
This brings builtin-stripspace, builtin-tag and mktag to use strbufs. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pierre Habouzit
Junio C Hamano
parent
635d043f30
commit
fd17f5b5f7
@ -1,5 +1,6 @@
|
||||
#include "builtin.h"
|
||||
#include "cache.h"
|
||||
#include "strbuf.h"
|
||||
|
||||
/*
|
||||
* Returns the length of a line, without trailing spaces.
|
||||
@ -74,26 +75,22 @@ size_t stripspace(char *buffer, size_t length, int skip_comments)
|
||||
|
||||
int cmd_stripspace(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
char *buffer;
|
||||
unsigned long size;
|
||||
struct strbuf buf;
|
||||
int strip_comments = 0;
|
||||
|
||||
if (argc > 1 && (!strcmp(argv[1], "-s") ||
|
||||
!strcmp(argv[1], "--strip-comments")))
|
||||
strip_comments = 1;
|
||||
|
||||
size = 1024;
|
||||
buffer = xmalloc(size);
|
||||
if (read_fd(0, &buffer, &size)) {
|
||||
free(buffer);
|
||||
strbuf_init(&buf, 0);
|
||||
if (strbuf_read(&buf, 0, 1024) < 0)
|
||||
die("could not read the input");
|
||||
}
|
||||
|
||||
size = stripspace(buffer, size, strip_comments);
|
||||
write_or_die(1, buffer, size);
|
||||
if (size)
|
||||
putc('\n', stdout);
|
||||
strbuf_setlen(&buf, stripspace(buf.buf, buf.len, strip_comments));
|
||||
if (buf.len)
|
||||
strbuf_addch(&buf, '\n');
|
||||
|
||||
free(buffer);
|
||||
write_or_die(1, buf.buf, buf.len);
|
||||
strbuf_release(&buf);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
|
||||
#include "cache.h"
|
||||
#include "builtin.h"
|
||||
#include "strbuf.h"
|
||||
#include "refs.h"
|
||||
#include "tag.h"
|
||||
#include "run-command.h"
|
||||
@ -17,7 +18,7 @@ static const char builtin_tag_usage[] =
|
||||
|
||||
static char signingkey[1000];
|
||||
|
||||
static void launch_editor(const char *path, char **buffer, unsigned long *len)
|
||||
static void launch_editor(const char *path, struct strbuf *buffer)
|
||||
{
|
||||
const char *editor, *terminal;
|
||||
struct child_process child;
|
||||
@ -55,10 +56,8 @@ static void launch_editor(const char *path, char **buffer, unsigned long *len)
|
||||
fd = open(path, O_RDONLY);
|
||||
if (fd < 0)
|
||||
die("could not open '%s': %s", path, strerror(errno));
|
||||
if (read_fd(fd, buffer, len)) {
|
||||
free(*buffer);
|
||||
die("could not read message file '%s': %s",
|
||||
path, strerror(errno));
|
||||
if (strbuf_read(buffer, fd, 0) < 0) {
|
||||
die("could not read message file '%s': %s", path, strerror(errno));
|
||||
}
|
||||
close(fd);
|
||||
}
|
||||
@ -184,7 +183,7 @@ static int verify_tag(const char *name, const char *ref,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static ssize_t do_sign(char *buffer, size_t size, size_t max)
|
||||
static int do_sign(struct strbuf *buffer)
|
||||
{
|
||||
struct child_process gpg;
|
||||
const char *args[4];
|
||||
@ -216,22 +215,22 @@ static ssize_t do_sign(char *buffer, size_t size, size_t max)
|
||||
if (start_command(&gpg))
|
||||
return error("could not run gpg.");
|
||||
|
||||
if (write_in_full(gpg.in, buffer, size) != size) {
|
||||
if (write_in_full(gpg.in, buffer->buf, buffer->len) != buffer->len) {
|
||||
close(gpg.in);
|
||||
finish_command(&gpg);
|
||||
return error("gpg did not accept the tag data");
|
||||
}
|
||||
close(gpg.in);
|
||||
gpg.close_in = 0;
|
||||
len = read_in_full(gpg.out, buffer + size, max - size);
|
||||
len = strbuf_read(buffer, gpg.out, 1024);
|
||||
|
||||
if (finish_command(&gpg) || !len || len < 0)
|
||||
return error("gpg failed to sign the tag");
|
||||
|
||||
if (len == max - size)
|
||||
if (len < 0)
|
||||
return error("could not read the entire signature from gpg.");
|
||||
|
||||
return size + len;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const char tag_template[] =
|
||||
@ -254,15 +253,13 @@ static int git_tag_config(const char *var, const char *value)
|
||||
return git_default_config(var, value);
|
||||
}
|
||||
|
||||
#define MAX_SIGNATURE_LENGTH 1024
|
||||
/* message must be NULL or allocated, it will be reallocated and freed */
|
||||
static void create_tag(const unsigned char *object, const char *tag,
|
||||
char *message, int sign, unsigned char *result)
|
||||
struct strbuf *buf, int message, int sign,
|
||||
unsigned char *result)
|
||||
{
|
||||
enum object_type type;
|
||||
char header_buf[1024], *buffer = NULL;
|
||||
int header_len, max_size;
|
||||
unsigned long size = 0;
|
||||
char header_buf[1024];
|
||||
int header_len;
|
||||
|
||||
type = sha1_object_info(object, NULL);
|
||||
if (type <= OBJ_NONE)
|
||||
@ -294,53 +291,40 @@ static void create_tag(const unsigned char *object, const char *tag,
|
||||
write_or_die(fd, tag_template, strlen(tag_template));
|
||||
close(fd);
|
||||
|
||||
launch_editor(path, &buffer, &size);
|
||||
launch_editor(path, buf);
|
||||
|
||||
unlink(path);
|
||||
free(path);
|
||||
}
|
||||
else {
|
||||
buffer = message;
|
||||
size = strlen(message);
|
||||
}
|
||||
|
||||
size = stripspace(buffer, size, 1);
|
||||
strbuf_setlen(buf, stripspace(buf->buf, buf->len, 1));
|
||||
|
||||
if (!message && !size)
|
||||
if (!message && !buf->len)
|
||||
die("no tag message?");
|
||||
|
||||
/* insert the header and add the '\n' if needed: */
|
||||
max_size = header_len + size + (sign ? MAX_SIGNATURE_LENGTH : 0) + 1;
|
||||
buffer = xrealloc(buffer, max_size);
|
||||
if (size)
|
||||
buffer[size++] = '\n';
|
||||
memmove(buffer + header_len, buffer, size);
|
||||
memcpy(buffer, header_buf, header_len);
|
||||
size += header_len;
|
||||
if (buf->len)
|
||||
strbuf_addch(buf, '\n');
|
||||
strbuf_insert(buf, 0, header_buf, header_len);
|
||||
|
||||
if (sign) {
|
||||
ssize_t r = do_sign(buffer, size, max_size);
|
||||
if (r < 0)
|
||||
die("unable to sign the tag");
|
||||
size = r;
|
||||
}
|
||||
|
||||
if (write_sha1_file(buffer, size, tag_type, result) < 0)
|
||||
if (sign && do_sign(buf) < 0)
|
||||
die("unable to sign the tag");
|
||||
if (write_sha1_file(buf->buf, buf->len, tag_type, result) < 0)
|
||||
die("unable to write tag file");
|
||||
free(buffer);
|
||||
}
|
||||
|
||||
int cmd_tag(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
struct strbuf buf;
|
||||
unsigned char object[20], prev[20];
|
||||
int annotate = 0, sign = 0, force = 0, lines = 0;
|
||||
char *message = NULL;
|
||||
int annotate = 0, sign = 0, force = 0, lines = 0, message = 0;
|
||||
char ref[PATH_MAX];
|
||||
const char *object_ref, *tag;
|
||||
int i;
|
||||
struct ref_lock *lock;
|
||||
|
||||
git_config(git_tag_config);
|
||||
strbuf_init(&buf, 0);
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
const char *arg = argv[i];
|
||||
@ -376,11 +360,11 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
|
||||
die("option -m needs an argument.");
|
||||
if (message)
|
||||
die("only one -F or -m option is allowed.");
|
||||
message = xstrdup(argv[i]);
|
||||
strbuf_addstr(&buf, argv[i]);
|
||||
message = 1;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "-F")) {
|
||||
unsigned long len;
|
||||
int fd;
|
||||
|
||||
annotate = 1;
|
||||
@ -398,12 +382,10 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
|
||||
die("could not open '%s': %s",
|
||||
argv[i], strerror(errno));
|
||||
}
|
||||
len = 1024;
|
||||
message = xmalloc(len);
|
||||
if (read_fd(fd, &message, &len)) {
|
||||
free(message);
|
||||
if (strbuf_read(&buf, fd, 1024) < 0) {
|
||||
die("cannot read %s", argv[i]);
|
||||
}
|
||||
message = 1;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "-u")) {
|
||||
@ -451,7 +433,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
|
||||
die("tag '%s' already exists", tag);
|
||||
|
||||
if (annotate)
|
||||
create_tag(object, tag, message, sign, object);
|
||||
create_tag(object, tag, &buf, message, sign, object);
|
||||
|
||||
lock = lock_any_ref_for_update(ref, prev, 0);
|
||||
if (!lock)
|
||||
@ -459,5 +441,6 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
|
||||
if (write_ref_sha1(lock, object, NULL) < 0)
|
||||
die("%s: cannot update the ref", ref);
|
||||
|
||||
strbuf_release(&buf);
|
||||
return 0;
|
||||
}
|
||||
|
||||
1
cache.h
1
cache.h
@ -269,7 +269,6 @@ extern int ie_match_stat(struct index_state *, struct cache_entry *, struct stat
|
||||
extern int ie_modified(struct index_state *, struct cache_entry *, struct stat *, int);
|
||||
extern int ce_path_match(const struct cache_entry *ce, const char **pathspec);
|
||||
extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path);
|
||||
extern int read_fd(int fd, char **return_buf, unsigned long *return_size);
|
||||
extern int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object);
|
||||
extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object);
|
||||
extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
|
||||
|
||||
15
mktag.c
15
mktag.c
@ -1,4 +1,5 @@
|
||||
#include "cache.h"
|
||||
#include "strbuf.h"
|
||||
#include "tag.h"
|
||||
|
||||
/*
|
||||
@ -111,8 +112,7 @@ static int verify_tag(char *buffer, unsigned long size)
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
unsigned long size = 4096;
|
||||
char *buffer = xmalloc(size);
|
||||
struct strbuf buf;
|
||||
unsigned char result_sha1[20];
|
||||
|
||||
if (argc != 1)
|
||||
@ -120,21 +120,20 @@ int main(int argc, char **argv)
|
||||
|
||||
setup_git_directory();
|
||||
|
||||
if (read_fd(0, &buffer, &size)) {
|
||||
free(buffer);
|
||||
strbuf_init(&buf, 0);
|
||||
if (strbuf_read(&buf, 0, 4096) < 0) {
|
||||
die("could not read from stdin");
|
||||
}
|
||||
|
||||
/* Verify it for some basic sanity: it needs to start with
|
||||
"object <sha1>\ntype\ntagger " */
|
||||
if (verify_tag(buffer, size) < 0)
|
||||
if (verify_tag(buf.buf, buf.len) < 0)
|
||||
die("invalid tag signature file");
|
||||
|
||||
if (write_sha1_file(buffer, size, tag_type, result_sha1) < 0)
|
||||
if (write_sha1_file(buf.buf, buf.len, tag_type, result_sha1) < 0)
|
||||
die("unable to write tag file");
|
||||
|
||||
free(buffer);
|
||||
|
||||
strbuf_release(&buf);
|
||||
printf("%s\n", sha1_to_hex(result_sha1));
|
||||
return 0;
|
||||
}
|
||||
|
||||
60
sha1_file.c
60
sha1_file.c
@ -14,6 +14,7 @@
|
||||
#include "tag.h"
|
||||
#include "tree.h"
|
||||
#include "refs.h"
|
||||
#include "strbuf.h"
|
||||
|
||||
#ifndef O_NOATIME
|
||||
#if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
|
||||
@ -2302,68 +2303,25 @@ int has_sha1_file(const unsigned char *sha1)
|
||||
return find_sha1_file(sha1, &st) ? 1 : 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* reads from fd as long as possible into a supplied buffer of size bytes.
|
||||
* If necessary the buffer's size is increased using realloc()
|
||||
*
|
||||
* returns 0 if anything went fine and -1 otherwise
|
||||
*
|
||||
* The buffer is always NUL-terminated, not including it in returned size.
|
||||
*
|
||||
* NOTE: both buf and size may change, but even when -1 is returned
|
||||
* you still have to free() it yourself.
|
||||
*/
|
||||
int read_fd(int fd, char **return_buf, unsigned long *return_size)
|
||||
{
|
||||
char *buf = *return_buf;
|
||||
unsigned long size = *return_size;
|
||||
ssize_t iret;
|
||||
unsigned long off = 0;
|
||||
|
||||
if (!buf || size <= 1) {
|
||||
size = 1024;
|
||||
buf = xrealloc(buf, size);
|
||||
}
|
||||
|
||||
do {
|
||||
iret = xread(fd, buf + off, (size - 1) - off);
|
||||
if (iret > 0) {
|
||||
off += iret;
|
||||
if (off == size - 1) {
|
||||
size = alloc_nr(size);
|
||||
buf = xrealloc(buf, size);
|
||||
}
|
||||
}
|
||||
} while (iret > 0);
|
||||
|
||||
buf[off] = '\0';
|
||||
|
||||
*return_buf = buf;
|
||||
*return_size = off;
|
||||
|
||||
if (iret < 0)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object)
|
||||
{
|
||||
unsigned long size = 4096;
|
||||
char *buf = xmalloc(size);
|
||||
struct strbuf buf;
|
||||
int ret;
|
||||
|
||||
if (read_fd(fd, &buf, &size)) {
|
||||
free(buf);
|
||||
strbuf_init(&buf, 0);
|
||||
if (strbuf_read(&buf, fd, 4096) < 0) {
|
||||
strbuf_release(&buf);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!type)
|
||||
type = blob_type;
|
||||
if (write_object)
|
||||
ret = write_sha1_file(buf, size, type, sha1);
|
||||
ret = write_sha1_file(buf.buf, buf.len, type, sha1);
|
||||
else
|
||||
ret = hash_sha1_file(buf, size, type, sha1);
|
||||
free(buf);
|
||||
ret = hash_sha1_file(buf.buf, buf.len, type, sha1);
|
||||
strbuf_release(&buf);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user