mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace all read_fd use with strbuf_read, and get rid of it.

Browse Source 
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
2007-09-10 12:35:09 +02:00
committed by Junio C Hamano
parent 635d043f30
commit fd17f5b5f7
5 changed files with 56 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
builtin-tag.c
View File

@ -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;
}