青木日記

■ AMD64 で cvspserver が落ちる件

これか―――――――っ！

diff -u -r -p cvs-1.12.9/src/vers_ts.c cvs-1.12.9-my/src/vers_ts.c
--- cvs-1.12.9/src/vers_ts.c.org        2004-05-20 12:00:44.000000000 +0900
+++ cvs-1.12.9/src/vers_ts.c    2005-11-12 13:51:57.000000000 +0900
@@ -355,7 +355,7 @@ entries_time (time_t unixtime)
 {
     struct tm *tm_p;
     char *cp;
-    int length;
+    size_t length;
　
     /* We want to use the same timestamp format as is stored in the
        st_mtime.  For unix (and NT I think) this *must* be universal

本家ではすでに直ってるようだ。 つか、コンパイルで警告出てんだから気付けよ。

以下はおまけ。

diff -u -r -p cvs-1.12.9/diff/util.c cvs-1.12.9-my/diff/util.c
--- cvs-1.12.9/diff/util.c.org  2003-02-03 04:52:38.000000000 +0900
+++ cvs-1.12.9/diff/util.c      2005-11-12 13:36:01.000000000 +0900
@@ -235,7 +235,7 @@ begin_output ()
              close (pipes[0]);
            }
　
-         execl (PR_PROGRAM, PR_PROGRAM, "-f", "-h", name, 0);
+         execl (PR_PROGRAM, PR_PROGRAM, "-f", "-h", name, (char*)0);
          pfatal_with_name (PR_PROGRAM);
        }
       else
diff -u -r -p cvs-1.12.9/src/subr.c cvs-1.12.9-my/src/subr.c
--- cvs-1.12.9/src/subr.c.org   2004-06-09 23:52:39.000000000 +0900
+++ cvs-1.12.9/src/subr.c       2005-11-12 13:48:42.000000000 +0900
@@ -1305,7 +1305,7 @@ format_cmdline (const char *format, ...)
                        dellist(&pflist);
                        free(b);
                        error (1, 0,
-"internal error:  unknown integer arg size (%d)",
+"internal error:  unknown integer arg size (%ld)",
                                length);
                        break;
                }
@@ -1348,7 +1348,7 @@ format_cmdline (const char *format, ...)
                        dellist(&pflist);
                        free(b);
                        error (1, 0,
-"internal error:  unknown floating point arg size (%d)",
+"internal error:  unknown floating point arg size (%ld)",
                                length);
                        break;
                }
diff -u -r -p cvs-1.12.9/src/wrapper.c cvs-1.12.9-my/src/wrapper.c
--- cvs-1.12.9/src/wrapper.c.org        2005-11-12 14:11:57.000000000 +0900
+++ cvs-1.12.9/src/wrapper.c    2005-11-12 13:52:41.000000000 +0900
@@ -245,6 +245,7 @@ wrap_unparse_rcs_options (char **line, i
  * Remove fmt str specifier other than %% or %s. And allow
  * only max_s %s specifiers
  */
+static void
 wrap_clean_fmt_str(char *fmt, int max_s)
 {
     while (*fmt) {

これで型関係のエラーは全部潰したはず。

(15:31)

■ AMD64 で cvspserver が落ちる (2)

くっそー、Debian でも 11/4 に fix されてる。一週間ちょっと遅かったか。

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=329127

(15:54)