X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=reposerve;a=blobdiff_plain;f=src%2Fproto.c;h=9701ab45d472f0ca7e30c86215d36f2799ca31af;hp=7d6466cd0ff0d2d4dcd66e63948391e255a7b683;hb=916d08f8d02fe9c08ed2574fc5dbe55a00a2e3e2;hpb=8f61a4a76806a3788f817d8833ac77a34c76484f diff --git a/src/proto.c b/src/proto.c index 7d6466c..9701ab4 100644 --- a/src/proto.c +++ b/src/proto.c @@ -28,7 +28,7 @@ void flist_destroy(struct flist *flist) } } -int flist_add(struct flist *flist, const char *fname, int contents) +int flist_add(struct flist *flist, const char *name, const char *path, int contents) { FILE *fp; struct proto_file_entry fent; @@ -43,8 +43,8 @@ int flist_add(struct flist *flist, const char *fname, int contents) return -1; } - if(!(fp = fopen(fname, "rb"))) { - fprintf(stderr, "flist_add: failed to open file: %s: %s\n", fname, strerror(errno)); + if(!(fp = fopen(path, "rb"))) { + fprintf(stderr, "flist_add: failed to open file: %s: %s\n", path, strerror(errno)); return -1; } fstat(fileno(fp), &st); @@ -52,7 +52,7 @@ int flist_add(struct flist *flist, const char *fname, int contents) fent.size = st.st_size; fent.mtime = st.st_mtime; - namelen = datalen = strlen(fname); + namelen = datalen = strlen(name); if(contents) { datalen += fent.size; } @@ -92,7 +92,7 @@ int flist_add(struct flist *flist, const char *fname, int contents) fent.nameoffs = flist->data_sz; fent.namelen = namelen; dptr = flist->data + flist->data_sz; - memcpy(dptr, fname, namelen); + memcpy(dptr, name, namelen); md5_begin(&md); if(contents) {