[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog gpg.c gpg.h log.c rcs.c
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog gpg.c gpg.h log.c rcs.c |
Date: |
Wed, 24 May 2006 16:22:06 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch:
Changes by: Derek Robert Price <address@hidden> 06/05/24 16:22:06
Modified files:
src : ChangeLog gpg.c gpg.h log.c rcs.c
Log message:
* gpg.c (gpg_keyid2string): New function.
* gpg.h (gpg_keyid2string): New macro/function.
* log.c (log_version): Avoid long long.
* rcs.c (RCS_delete_openpgp_signatures): Likewise.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3426&tr2=1.3427&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/gpg.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/gpg.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/log.c.diff?tr1=1.107&tr2=1.108&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/rcs.c.diff?tr1=1.367&tr2=1.368&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3426 ccvs/src/ChangeLog:1.3427
--- ccvs/src/ChangeLog:1.3426 Tue May 23 17:47:39 2006
+++ ccvs/src/ChangeLog Wed May 24 16:22:06 2006
@@ -1,3 +1,10 @@
+2006-05-24 Derek Price <address@hidden>
+
+ * gpg.c (gpg_keyid2string): New function.
+ * gpg.h (gpg_keyid2string): New macro/function.
+ * log.c (log_version): Avoid long long.
+ * rcs.c (RCS_delete_openpgp_signatures): Likewise.
+
2006-05-23 Mark D. Baushke <address@hidden>
* filesubr.c: Reformat according to HACKING standards.
Index: ccvs/src/gpg.c
diff -u ccvs/src/gpg.c:1.2 ccvs/src/gpg.c:1.3
--- ccvs/src/gpg.c:1.2 Mon Apr 24 18:50:26 2006
+++ ccvs/src/gpg.c Wed May 24 16:22:06 2006
@@ -800,3 +800,18 @@
if (tmp && !strlen (tmp)) return NULL;
/* else */ return tmp;
}
+
+
+
+#ifndef HAVE_LONG_LONG
+char *
+gpg_keyid2string (uint64_t keyid)
+{
+ if (!(keyid >> 32))
+ return Xasprintf ("0x%lx", (unsigned long)keyid);
+ /* else */
+ return Xasprintf ("0x%lx%lx",
+ (unsigned long)(keyid >> 32),
+ (unsigned long)(keyid & 0xFFFFFFFF));
+}
+#endif /* !HAVE_LONG_LONG */
Index: ccvs/src/gpg.h
diff -u ccvs/src/gpg.h:1.2 ccvs/src/gpg.h:1.3
--- ccvs/src/gpg.h:1.2 Mon Apr 24 18:50:26 2006
+++ ccvs/src/gpg.h Wed May 24 16:22:06 2006
@@ -45,4 +45,10 @@
void set_openpgp_textmode (const char *textmode);
const char *get_openpgp_textmode (void);
+
+# ifdef HAVE_LONG_LONG
+# define gpg_keyid2string(k) Xasprintf ("0x%llx", (unsigned long long)(k))
+# else
+char *gpg_keyid2string (uint64_t keyid);
+# endif
#endif /* GPG_H */
Index: ccvs/src/log.c
diff -u ccvs/src/log.c:1.107 ccvs/src/log.c:1.108
--- ccvs/src/log.c:1.107 Sat May 13 00:54:04 2006
+++ ccvs/src/log.c Wed May 24 16:22:06 2006
@@ -1706,12 +1706,11 @@
while (!(rc = parse_signature (membuf, &sig)))
{
- /* GnuPG truncates this too. */
- unsigned long long printablesig = sig.keyid & 0xFFFFFFFF;
char *hexsig;
cvs_output_tagged ("openpgp-keyid-header",
"OpenPGP signature using key ID 0x");
- hexsig = Xasprintf ("%llx", printablesig);
+ /* GnuPG truncates this too. */
+ hexsig = Xasprintf ("%lx", (unsigned long)(sig.keyid & 0xFFFFFFFF));
cvs_output_tagged ("openpgp-keyid", hexsig);
free (hexsig);
cvs_output_tagged ("openpgp-keyid-footer", ";");
Index: ccvs/src/rcs.c
diff -u ccvs/src/rcs.c:1.367 ccvs/src/rcs.c:1.368
--- ccvs/src/rcs.c:1.367 Tue May 23 02:08:19 2006
+++ ccvs/src/rcs.c Wed May 24 16:22:06 2006
@@ -4936,8 +4936,8 @@
bool found = false;
int rc;
- TRACE (TRACE_FUNCTION, "RCS_delete_openpgp_signatures (%s, %s, %llx)",
- finfo->fullname, rev, (unsigned long long)keyid);
+ TRACE (TRACE_FUNCTION, "RCS_delete_openpgp_signatures (%s, %s, 0x%lx)",
+ finfo->fullname, rev, (unsigned long) keyid);
if (finfo->rcs->flags & PARTIAL)
RCS_reparsercsfile (finfo->rcs, NULL, NULL);
@@ -4977,8 +4977,13 @@
*/
while (!(rc = parse_signature (membuf, &sig)))
{
- char *hexid1 = Xasprintf ("0x%llx", (unsigned long long) keyid);
- char *hexid2 = Xasprintf ("0x%llx", (unsigned long long) sig.keyid);
+ char *hexid1;
+ char *hexid2;
+ if (trace >= TRACE_DATA)
+ {
+ hexid1 = Xasprintf ("0x%lx", (unsigned long) keyid);
+ hexid2 = gpg_keyid2string (sig.keyid);
+ }
if ((sig.keyid & 0xFFFFFFFF) == keyid)
{
TRACE (TRACE_DATA, "%s is a match for %s", hexid1, hexid2);
@@ -4991,14 +4996,19 @@
memcpy (newsigs + newlen, sig.raw, sig.rawlen);
newlen += sig.rawlen;
}
- free (hexid1);
- free (hexid2);
+ if (trace >= TRACE_DATA)
+ {
+ free (hexid1);
+ free (hexid2);
+ }
free (sig.raw);
}
if (!found)
{
- char *hexid = Xasprintf ("0x%llx", (unsigned long long) keyid);
+ char *hexid = Xasprintf ("0x%lx%lx",
+ (unsigned long)(keyid >> 32),
+ (unsigned long)(keyid & 0xFFFFFFFF));
error (0, 0,
"No signatures with key ID %s found in revision %s of `%s'",
hexid, rev, finfo->fullname);
- [Cvs-cvs] ccvs/src ChangeLog gpg.c gpg.h log.c rcs.c,
Derek Robert Price <=