proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 15:10:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix more issues with Win32 EOL

Browse Source 
Signed-off-by: Vicent Marti <tanoku@gmail.com>
This commit is contained in:
Vicent Marti 2011-02-02 06:16:50 +02:00
parent ff5873ad95
commit ddc9e79ae2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/refs.c
View File

@ -95,7 +95,7 @@ int git_reference_new(git_reference **ref_out, git_repository *repo)
static int parse_sym_ref(git_reference *ref, gitfo_buf *file_content) static int parse_sym_ref(git_reference *ref, gitfo_buf *file_content)
{ {
const int header_len = strlen(GIT_SYMREF); const unsigned int header_len = strlen(GIT_SYMREF);
const char *refname_start; const char *refname_start;
char *eol; char *eol;
@ -318,10 +318,6 @@ static int parse_packed_line(
goto cleanup; goto cleanup;
} }
/* windows line feeds */
if (refname_end[-1] == '\r')
refname_end--;
refname_len = refname_end - refname_begin; refname_len = refname_end - refname_begin;
ref->name = git__malloc(refname_len + 1); ref->name = git__malloc(refname_len + 1);
@ -333,6 +329,9 @@ static int parse_packed_line(
memcpy(ref->name, refname_begin, refname_len); memcpy(ref->name, refname_begin, refname_len);
ref->name[refname_len] = 0; ref->name[refname_len] = 0;
if (ref->name[refname_len - 1] == '\r')
ref->name[refname_len - 1] = 0;
ref->type = GIT_REF_OID; ref->type = GIT_REF_OID;
ref->packed = 1; ref->packed = 1;
@ -368,6 +367,14 @@ static int parse_packed_refs(git_refcache *ref_cache, git_repository *repo)
/* Let's skip the header */ /* Let's skip the header */
buffer_start += strlen(GIT_PACKEDREFS_HEADER); buffer_start += strlen(GIT_PACKEDREFS_HEADER);
if (*buffer_start == '\r')
buffer_start++;
if (*buffer_start != '\n')
return GIT_EPACKEDREFSCORRUPTED;
buffer_start++;
while (buffer_start < buffer_end) { while (buffer_start < buffer_end) {
git_reference *ref = NULL; git_reference *ref = NULL;

2
src/refs.h
View File

@ -11,7 +11,7 @@
#define GIT_SYMREF "ref: " #define GIT_SYMREF "ref: "
#define GIT_PACKEDREFS_FILE "packed-refs" #define GIT_PACKEDREFS_FILE "packed-refs"
#define GIT_PACKEDREFS_HEADER "# pack-refs with: peeled \n" #define GIT_PACKEDREFS_HEADER "# pack-refs with: peeled "
#define MAX_GITDIR_TREE_STRUCTURE_PATH_LENGTH 100 #define MAX_GITDIR_TREE_STRUCTURE_PATH_LENGTH 100
struct git_reference { struct git_reference {