Changeset 167

Timestamp:

06/15/05 13:35:38

Author:

ben

Message:

Determine correct format for time_t.

Files:

• openpgpsdk/trunk/configure (modified) (4 diffs)
• openpgpsdk/trunk/examples/packet-dump.c (modified) (3 diffs)
• openpgpsdk/trunk/include/configure.h.template (modified) (1 diff)

openpgpsdk/trunk/configure

@@ -4 +4 @@
-
-use Carp;
+use File::Temp;
-
-our %Subst=(
@@ -27 +28 @@
-
-my @Headers=qw(alloca.h);
+my @Types=qw(time_t);
-
-our %Knowledge=(
-       
+       
-                             || croak 'Can\'t find C compiler'; },
-
+
+
-              );
-
@@ -45 +48 @@
-}
-
-
+#
-
-$Subst{'CC'}=getKnowledge('cc');
-
-findHeaders(\@Headers);
+investigateTypes(\@Types);
-
-fixSubst();
@@ -155 +159 @@
-}
-
+sub build {
+    my $code=shift;
+
+    my $cc=getKnowledge('cc');
+    my $fh=new File::Temp(SUFFIX => '.c');
+#    print $fh->filename(),"\n";
+    print $fh $code;
+#    print $code;
+    $fh->close();
+
+    my $cmd="$cc -Wall -Werror -c ".$fh;
+#    print "$cmd\n";
+    my $ret=system("$cmd > /dev/null 2>&1");
+
+    return $ret == 0;
+}
+
+sub typeInfo {
+    my $type=shift;
+    my $header=shift;
+
+    my %info;
+
+    print "Getting info about $type.\n";
+
+    foreach my $fmt (qw(%d %ld)) {
+        my $code="#include <$header>\n";
+        $code .= "#include <stdio.h>\n";
+        $code .= "void f(void) { static $type t; printf(\"$fmt\",t); }\n";
+        if(build($code)) {
+            $info{fmt}=$fmt;
+            print "  $type printf format is $fmt\n";
+        }
+    }
+    croak "Can't determine print format for $type" if !defined $info{fmt};
+
+    return \%info;
+}
+
+sub investigateTypes {
+    my $types=shift;
+
+    foreach my $type (@$types) {
+        my $info=getKnowledge($type);
+        $Subst{uc($type)."_FMT"}="\"$info->{fmt}\"";
+    }
+}
+

openpgpsdk/trunk/examples/packet-dump.c

@@ -2 +2 @@
-#include "packet-parse.h"
-#include "packet-show.h"
+#include "configure.h"
-#include "util.h"
-#include <unistd.h>
@@ -20 +21 @@
-static void showtime(const unsigned char *name,time_t t)
-    {
-%ld
+" TIME_T_FMT "
-    }
-
@@ -45 +46 @@
-    print_indent();
-    printf("%s: ",name);
-%ld
+" TIME_T_FMT "
-
-    mins=time/60;

openpgpsdk/trunk/include/configure.h.template

@@ -1 +1 @@
-%HAVE_ALLOCA_H%
+#define TIME_T_FMT      %TIME_T_FMT%