Changed files:
cvsps-fixes.patch -> 1.2
-diff --git a/Makefile b/Makefile
-index 507c3e9..05ca856 100644
---- a/Makefile
-+++ b/Makefile
+--- b/Makefile
++++ b/Makefile 2011-01-31 08:14:42.829723957 +0200
@@ -1,8 +1,8 @@
MAJOR=2
MINOR=1
@@ -1,8 +1,8 @@
MAJOR=2
MINOR=1
prefix?=/usr/local
OBJS=\
cbtcommon/debug.o\
prefix?=/usr/local
OBJS=\
cbtcommon/debug.o\
-@@ -20,6 +20,9 @@ OBJS=\
cvsps: $(OBJS)
$(CC) -o cvsps $(OBJS) -lz
cvsps: $(OBJS)
$(CC) -o cvsps $(OBJS) -lz
-@@ -33,3 +36,27 @@ clean:
- rm -f cvsps *.o cbtcommon/*.o core
+@@ -32,4 +35,31 @@
++tags: *.c *.h cbtcommon/*.c cbtcommon/*.h
++ ctags *.c *.h cbtcommon/*.c cbtcommon/*.h
++
+ clean:
+- rm -f cvsps *.o cbtcommon/*.o core
++ rm -f cvsps *.o cbtcommon/*.o core tags
.PHONY: install clean
+# DO NOT DELETE
.PHONY: install clean
+# DO NOT DELETE
+cbtcommon/tcpsocket.o: cbtcommon/tcpsocket.h cbtcommon/debug.h
+cbtcommon/tcpsocket.o: ./cbtcommon/inline.h cbtcommon/rcsid.h
+cbtcommon/text_util.o: cbtcommon/text_util.h cbtcommon/rcsid.h
+cbtcommon/tcpsocket.o: cbtcommon/tcpsocket.h cbtcommon/debug.h
+cbtcommon/tcpsocket.o: ./cbtcommon/inline.h cbtcommon/rcsid.h
+cbtcommon/text_util.o: cbtcommon/text_util.h cbtcommon/rcsid.h
-diff --git a/cache.c b/cache.c
-index 4c51cf7..5f67a7c 100644
--- a/cache.c
+++ b/cache.c
@@ -108,10 +108,19 @@ time_t read_cache()
--- a/cache.c
+++ b/cache.c
@@ -108,10 +108,19 @@ time_t read_cache()
break;
case CR_DEAD:
dead = atoi(c);
break;
case CR_DEAD:
dead = atoi(c);
-diff --git a/cap.c b/cap.c
-index a6186f6..a1927df 100644
--- a/cap.c
+++ b/cap.c
@@ -121,11 +121,19 @@ int check_version_string(const char * str, int req_major, int req_minor, int req
--- a/cap.c
+++ b/cap.c
@@ -121,11 +121,19 @@ int check_version_string(const char * str, int req_major, int req_minor, int req
}
return (major > req_major ||
}
return (major > req_major ||
-diff --git a/cbtcommon/tcpsocket.c b/cbtcommon/tcpsocket.c
-index 27cc13a..f31060e 100644
--- a/cbtcommon/tcpsocket.c
+++ b/cbtcommon/tcpsocket.c
@@ -185,20 +185,20 @@ tcp_connect(int sockfd, const char *rem_addr, unsigned short port)
--- a/cbtcommon/tcpsocket.c
+++ b/cbtcommon/tcpsocket.c
@@ -185,20 +185,20 @@ tcp_connect(int sockfd, const char *rem_addr, unsigned short port)
-diff --git a/cvsps.1 b/cvsps.1
-index cea0faf..6cfdac6 100644
---- a/cvsps.1
-+++ b/cvsps.1
-@@ -83,7 +83,7 @@ some hacks which are not generally applicable.
+--- b/cvsps.1
++++ b/cvsps.1 2011-01-31 08:14:42.846391432 +0200
+@@ -83,7 +83,7 @@
disable the use of rlog internally. Note: rlog is
required for stable PatchSet numbering. Use with care.
.TP
disable the use of rlog internally. Note: rlog is
required for stable PatchSet numbering. Use with care.
.TP
send a custom set of options to diff, for example to increase
the number of context lines, or change the diff format.
.TP
send a custom set of options to diff, for example to increase
the number of context lines, or change the diff format.
.TP
-diff --git a/cvsps.c b/cvsps.c
-index 1e64e3c..981cd78 100644
---- a/cvsps.c
-+++ b/cvsps.c
-@@ -39,7 +39,8 @@ RCSID("$Id$");
+@@ -103,6 +103,7 @@
+ .TP
+ .B \-q
+ Be quiet about warnings.
++.TP
+ .B \-A
+ Show ancestor branch when a new branch is found.
+ .TP
+--- b/cvsps.c
++++ b/cvsps.c 2011-01-31 08:14:42.846391432 +0200
+@@ -39,7 +39,8 @@
NEED_SYMS,
NEED_EOS,
NEED_START_LOG,
NEED_SYMS,
NEED_EOS,
NEED_START_LOG,
-@@ -117,7 +118,9 @@ static int parse_args(int, char *[]);
static int parse_rc();
static void load_from_cvs();
static void init_paths();
static int parse_rc();
static void load_from_cvs();
static void init_paths();
static CvsFileRevision * parse_revision(CvsFile * file, char * rev_str);
static void assign_pre_revision(PatchSetMember *, CvsFileRevision * rev);
static void check_print_patch_set(PatchSet *);
static CvsFileRevision * parse_revision(CvsFile * file, char * rev_str);
static void assign_pre_revision(PatchSetMember *, CvsFileRevision * rev);
static void check_print_patch_set(PatchSet *);
-@@ -260,12 +263,13 @@ static void load_from_cvs()
{
FILE * cvsfp;
char buff[BUFSIZ];
{
FILE * cvsfp;
char buff[BUFSIZ];
int loglen = 0;
int have_log = 0;
char cmd[BUFSIZ];
int loglen = 0;
int have_log = 0;
char cmd[BUFSIZ];
-@@ -273,6 +277,12 @@ static void load_from_cvs()
char use_rep_buff[PATH_MAX];
char * ltype;
char use_rep_buff[PATH_MAX];
char * ltype;
if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG))
{
ltype = "rlog";
if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG))
{
ltype = "rlog";
-@@ -298,12 +308,12 @@ static void load_from_cvs()
* which is necessary to fill in the pre_rev stuff for a
* PatchSetMember
*/
* which is necessary to fill in the pre_rev stuff for a
* PatchSetMember
*/
}
debug(DEBUG_STATUS, "******* USING CMD %s", cmd);
}
debug(DEBUG_STATUS, "******* USING CMD %s", cmd);
-@@ -339,10 +349,26 @@ static void load_from_cvs()
case NEED_SYMS:
if (strncmp(buff, "symbolic names:", 15) == 0)
state = NEED_EOS;
case NEED_SYMS:
if (strncmp(buff, "symbolic names:", 15) == 0)
state = NEED_EOS;
-@@ -471,7 +497,7 @@ static void load_from_cvs()
have_log = 0;
psm = NULL;
file = NULL;
have_log = 0;
psm = NULL;
file = NULL;
-@@ -480,24 +506,22 @@ static void load_from_cvs()
*/
if (have_log || !is_revision_metadata(buff))
{
*/
if (have_log || !is_revision_metadata(buff))
{
}
debug(DEBUG_STATUS, "appending %s to log", buff);
}
debug(DEBUG_STATUS, "appending %s to log", buff);
-@@ -524,7 +548,7 @@ static void load_from_cvs()
{
debug(DEBUG_APPERROR, "Error: Log file parsing error. (%d) Use -v to debug", state);
exit(1);
{
debug(DEBUG_APPERROR, "Error: Log file parsing error. (%d) Use -v to debug", state);
exit(1);
-@@ -1038,8 +1062,8 @@ static void init_paths()
*
* NOTE: because of some bizarre 'feature' in cvs, when 'rlog' is used
* (instead of log) it gives the 'real' RCS file path, which can be different
*
* NOTE: because of some bizarre 'feature' in cvs, when 'rlog' is used
* (instead of log) it gives the 'real' RCS file path, which can be different
*/
strip_path_len = snprintf(strip_path, PATH_MAX, "%s/%s/", p, repository_path);
*/
strip_path_len = snprintf(strip_path, PATH_MAX, "%s/%s/", p, repository_path);
-@@ -1052,9 +1076,8 @@ static void init_paths()
debug(DEBUG_STATUS, "strip_path: %s", strip_path);
}
debug(DEBUG_STATUS, "strip_path: %s", strip_path);
}
char fn[PATH_MAX];
int len = strlen(buff + 10);
char * p;
char fn[PATH_MAX];
int len = strlen(buff + 10);
char * p;
-@@ -1129,6 +1152,28 @@ static CvsFile * parse_file(const char * buff)
debug(DEBUG_STATUS, "stripped filename %s", fn);
debug(DEBUG_STATUS, "stripped filename %s", fn);
retval = (CvsFile*)get_hash_object(file_hash, fn);
if (!retval)
retval = (CvsFile*)get_hash_object(file_hash, fn);
if (!retval)
-@@ -2104,6 +2149,11 @@ static void parse_sym(CvsFile * file, char * sym)
if (!get_branch_ext(rev, eot, &leaf))
{
if (!get_branch_ext(rev, eot, &leaf))
{
debug(DEBUG_APPERROR, "malformed revision");
exit(1);
}
debug(DEBUG_APPERROR, "malformed revision");
exit(1);
}
-@@ -2384,8 +2434,31 @@ void patch_set_add_member(PatchSet * ps, PatchSetMember * psm)
for (next = ps->members.next; next != &ps->members; next = next->next)
{
PatchSetMember * m = list_entry(next, PatchSetMember, link);
for (next = ps->members.next; next != &ps->members; next = next->next)
{
PatchSetMember * m = list_entry(next, PatchSetMember, link);
-@@ -2576,7 +2649,7 @@ static void determine_branch_ancestor(PatchSet * ps, PatchSet * head_ps)
+@@ -2398,11 +2471,10 @@
+ if (psm->post_rev->dead)
+ {
+ /*
+- * we expect a 'file xyz initially added on branch abc' here
+- * but there can only be one such member in a given patchset
++ * We expect a 'file xyz initially added on branch abc' here.
++ * There can only be several such member in a given patchset,
++ * since cvs only includes the file basename in the log message.
+ */
+- if (psm->ps->branch_add)
+- debug(DEBUG_APPMSG1, "WARNING: branch_add already set!");
+ psm->ps->branch_add = 1;
+ }
+ }
+@@ -2576,7 +2648,7 @@
* note: rev is the pre-commit revision, not the post-commit
*/
if (!head_ps->ancestor_branch)
* note: rev is the pre-commit revision, not the post-commit
*/
if (!head_ps->ancestor_branch)
else if (strcmp(ps->branch, rev->branch) == 0)
continue;
else if (strcmp(head_ps->ancestor_branch, "HEAD") == 0)
else if (strcmp(ps->branch, rev->branch) == 0)
continue;
else if (strcmp(head_ps->ancestor_branch, "HEAD") == 0)
-diff --git a/cvsps_types.h b/cvsps_types.h
-index b41e2a9..dba145d 100644
--- a/cvsps_types.h
+++ b/cvsps_types.h
@@ -8,7 +8,7 @@
--- a/cvsps_types.h
+++ b/cvsps_types.h
@@ -8,7 +8,7 @@
#define AUTH_STR_MAX 64
#define REV_STR_MAX 64
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define AUTH_STR_MAX 64
#define REV_STR_MAX 64
#define MIN(a, b) ((a) < (b) ? (a) : (b))
+--- a/cbtcommon/list.h 2005-05-26 06:39:40.000000000 +0300
++++ b/cbtcommon/list.h 2011-01-31 08:14:42.829723957 +0200
+@@ -23,6 +23,7 @@
+ */
+
+ #include "inline.h"
++#include <stddef.h>
+
+ struct list_head {
+ struct list_head *next, *prev;
+@@ -107,6 +108,6 @@
+ }
+
+ #define list_entry(ptr, type, member) \
+- ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
++ ((type *)((char *)(ptr)-offsetof(type, member)))
+
+ #endif /* _COMMON_LIST_H */
projects / packages / cvsps.git / commitdiff