diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-21 14:00:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-21 14:00:47 -0800 |
| commit | 2a212746f44f18695d33931039da10f842de7b25 (patch) | |
| tree | 73e3445f380222ecb9d86290ec1118671a866c28 | |
| parent | 5d9d11db3c6768d67250b47391a944471bcd92c3 (diff) | |
| parent | 8ac4838af428a2a32498b3e8d13295eb714654b4 (diff) | |
| download | git-2a212746f44f18695d33931039da10f842de7b25.tar.gz git-2a212746f44f18695d33931039da10f842de7b25.tar.xz | |
Merge branch 'fixes'
| -rw-r--r-- | http-fetch.c | 4 | ||||
| -rw-r--r-- | index-pack.c | 2 | ||||
| -rw-r--r-- | quote.c | 6 | ||||
| -rw-r--r-- | send-pack.c | 2 | ||||
| -rw-r--r-- | server-info.c | 6 |
5 files changed, 13 insertions, 7 deletions
diff --git a/http-fetch.c b/http-fetch.c index ad59f1cce..3cd6ef91a 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -658,7 +658,7 @@ static int fetch_indices(struct alt_base *repo) switch (data[i]) { case 'P': i++; - if (i + 52 < buffer.posn && + if (i + 52 <= buffer.posn && !strncmp(data + i, " pack-", 6) && !strncmp(data + i + 46, ".pack\n", 6)) { get_sha1_hex(data + i + 6, sha1); @@ -667,7 +667,7 @@ static int fetch_indices(struct alt_base *repo) break; } default: - while (data[i] != '\n') + while (i < buffer.posn && data[i] != '\n') i++; } i++; diff --git a/index-pack.c b/index-pack.c index 785fe71a6..d4ce3af58 100644 --- a/index-pack.c +++ b/index-pack.c @@ -440,7 +440,7 @@ int main(int argc, char **argv) if (len < 5 || strcmp(pack_name + len - 5, ".pack")) die("packfile name '%s' does not end with '.pack'", pack_name); - index_name_buf = xmalloc(len - 1); + index_name_buf = xmalloc(len); memcpy(index_name_buf, pack_name, len - 5); strcpy(index_name_buf + len - 5, ".idx"); index_name = index_name_buf; @@ -126,8 +126,10 @@ static int quote_c_style_counted(const char *name, int namelen, if (!no_dq) EMIT('"'); - for (sp = name; (ch = *sp++) && (sp - name) <= namelen; ) { - + for (sp = name; sp < name + namelen; sp++) { + ch = *sp; + if (!ch) + break; if ((ch < ' ') || (ch == '"') || (ch == '\\') || (ch == 0177)) { needquote = 1; diff --git a/send-pack.c b/send-pack.c index a41bbe5ec..5bc2f017b 100644 --- a/send-pack.c +++ b/send-pack.c @@ -272,7 +272,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) packet_flush(out); if (new_refs) pack_objects(out, remote_refs); - else + else if (ret == 0) fprintf(stderr, "Everything up-to-date\n"); close(out); return ret; diff --git a/server-info.c b/server-info.c index df19e49b5..05bce7da3 100644 --- a/server-info.c +++ b/server-info.c @@ -99,7 +99,10 @@ static int read_pack_info_file(const char *infofile) while (fgets(line, sizeof(line), fp)) { int len = strlen(line); if (line[len-1] == '\n') - line[len-1] = 0; + line[--len] = 0; + + if (!len) + continue; switch (line[0]) { case 'P': /* P name */ @@ -200,6 +203,7 @@ static void write_pack_info_file(FILE *fp) int i; for (i = 0; i < num_pack; i++) fprintf(fp, "P %s\n", info[i]->p->pack_name + objdirlen + 6); + fputc('\n', fp); } static int update_info_packs(int force) |