From 2ba91e96981fb92f42b01dfae8a315b2965077d5 Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Thu, 1 Mar 2007 22:41:14 +0300 Subject: Documentation/build-docdep.perl: Fix dependencies for included asciidoc files Adding dependencies on included files to the generated man pages is wrong - includes are processed by asciidoc, therefore the intermediate Docbook XML files really depend on included files. Because of these wrong dependencies the man pages were not rebuilt properly if the intermediate XML files were left in the tree. Signed-off-by: Sergey Vlasov Signed-off-by: Junio C Hamano --- Documentation/build-docdep.perl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Documentation/build-docdep.perl b/Documentation/build-docdep.perl index 489389c32..ba4205e03 100755 --- a/Documentation/build-docdep.perl +++ b/Documentation/build-docdep.perl @@ -41,10 +41,6 @@ while ($changed) { while (my ($text, $included) = each %include) { if (! exists $included{$text} && (my $base = $text) =~ s/\.txt$//) { - my ($suffix) = '1'; - if ($base eq 'git') { - $suffix = '7'; # yuck... - } - print "$base.html $base.$suffix : ", join(" ", keys %$included), "\n"; + print "$base.html $base.xml : ", join(" ", keys %$included), "\n"; } } -- cgit v1.2.1 From d53ebb429a858bb7ec1f22e80ac3da26d24d414a Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Thu, 1 Mar 2007 22:41:15 +0300 Subject: Documentation/git-quiltimport.txt: Fix labeled list formatting Mark the continuation paragraph of a list entry as such to avoid getting a literal paragraph instead. Signed-off-by: Sergey Vlasov Signed-off-by: Junio C Hamano --- Documentation/git-quiltimport.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt index 6e9a8c369..296937a41 100644 --- a/Documentation/git-quiltimport.txt +++ b/Documentation/git-quiltimport.txt @@ -42,10 +42,10 @@ OPTIONS --patches :: The directory to find the quilt patches and the quilt series file. - - The default for the patch directory is patches - or the value of the $QUILT_PATCHES environment - variable. ++ +The default for the patch directory is patches +or the value of the $QUILT_PATCHES environment +variable. Author ------ -- cgit v1.2.1 From 5ef1f8d4889ccf6aaea62c5d465c8ad30a41dfc2 Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Thu, 1 Mar 2007 22:41:16 +0300 Subject: Documentation/git-send-email.txt: Fix labeled list formatting Mark continuation paragraphs of list entries as such to avoid getting literal paragraphs instead. Signed-off-by: Sergey Vlasov Signed-off-by: Junio C Hamano --- Documentation/git-send-email.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 4c8d907bd..35b0104e4 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -26,13 +26,13 @@ The options available are: --bcc:: Specify a "Bcc:" value for each email. - - The --bcc option must be repeated for each user you want on the bcc list. ++ +The --bcc option must be repeated for each user you want on the bcc list. --cc:: Specify a starting "Cc:" value for each email. - - The --cc option must be repeated for each user you want on the cc list. ++ +The --cc option must be repeated for each user you want on the cc list. --chain-reply-to, --no-chain-reply-to:: If this is set, each email will be sent as a reply to the previous @@ -87,8 +87,8 @@ The options available are: Specify the primary recipient of the emails generated. Generally, this will be the upstream maintainer of the project involved. - - The --to option must be repeated for each user you want on the to list. ++ +The --to option must be repeated for each user you want on the to list. Author -- cgit v1.2.1 From 3e4e8c03ca948e96b7f6a1730fb67034a6f942e3 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Thu, 1 Mar 2007 18:08:17 +0100 Subject: Documentation: Correct minor typo in git-add documentation. Signed-off-by: Christian Schlotter Signed-off-by: Junio C Hamano --- Documentation/git-add.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index b73a99d61..755d7186f 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -52,7 +52,7 @@ OPTIONS -f:: Allow adding otherwise ignored files. -\i, \--interactive:: +-i, \--interactive:: Add modified contents in the working tree interactively to the index. -- cgit v1.2.1 From 0df56eabf2cde83cb63c4acd7da2346c34220ac0 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 28 Feb 2007 00:55:48 +0100 Subject: fetch.o depends on the headers, too. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 64d29f7c1..9f2cbe2cb 100644 --- a/Makefile +++ b/Makefile @@ -775,7 +775,7 @@ git-http-push$X: revision.o http.o http-push.o $(GITLIBS) $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) -$(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H) +$(LIB_OBJS) $(BUILTIN_OBJS) fetch.o: $(LIB_H) $(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h) $(DIFF_OBJS): diffcore.h -- cgit v1.2.1 From eecc8367f4eaafc8449fc08c4e33f3f8ac474469 Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Thu, 1 Mar 2007 19:09:12 +0300 Subject: Another memory overrun in http-push.c Use of strlcpy() are wrong, as the source buffer at these locations may not be NUL-terminated. --- http-push.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/http-push.c b/http-push.c index cec7bf7fa..6af9aecee 100644 --- a/http-push.c +++ b/http-push.c @@ -1271,7 +1271,9 @@ xml_cdata(void *userData, const XML_Char *s, int len) struct xml_ctx *ctx = (struct xml_ctx *)userData; free(ctx->cdata); ctx->cdata = xmalloc(len + 1); - strlcpy(ctx->cdata, s, len + 1); + /* NB: 's' is not null-terminated, can not use strlcpy here */ + memcpy(ctx->cdata, s, len); + ctx->cdata[len] = '\0'; } static struct remote_lock *lock_remote(const char *path, long timeout) @@ -1473,7 +1475,8 @@ static void process_ls_object(struct remote_ls_ctx *ls) return; path += 8; obj_hex = xmalloc(strlen(path)); - strlcpy(obj_hex, path, 3); + /* NB: path is not null-terminated, can not use strlcpy here */ + memcpy(obj_hex, path, 2); strcpy(obj_hex + 2, path + 3); one_remote_object(obj_hex); free(obj_hex); @@ -2170,7 +2173,8 @@ static void fetch_symref(const char *path, char **symref, unsigned char *sha1) /* If it's a symref, set the refname; otherwise try for a sha1 */ if (!strncmp((char *)buffer.buffer, "ref: ", 5)) { *symref = xmalloc(buffer.posn - 5); - strlcpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 5); + memcpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 6); + (*symref)[buffer.posn - 6] = '\0'; } else { get_sha1_hex(buffer.buffer, sha1); } -- cgit v1.2.1