1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
$NetBSD: patch-transcript.c,v 1.2 2018/12/18 14:16:18 hauke Exp $
Newer Linuxen (2018 Arch here) have moved makedev(3) and friends
from <sys/types.h> to <sys/sysmacros.h>
Fix for Radmind bug #221, accomodating for 64 bit time_t
--- transcript.c.orig 2010-12-13 03:42:49.000000000 +0000
+++ transcript.c
@@ -6,6 +6,9 @@
#include "config.h"
#include <sys/types.h>
+#if defined (__linux__)
+#include <sys/sysmacros.h>
+#endif
#include <sys/param.h>
#ifdef sun
#include <sys/mkdev.h>
@@ -271,7 +274,7 @@ transcript_parse( struct transcript *tra
tran->t_pinfo.pi_stat.st_mode = strtol( argv[ 2 ], NULL, 8 );
tran->t_pinfo.pi_stat.st_uid = atoi( argv[ 3 ] );
tran->t_pinfo.pi_stat.st_gid = atoi( argv[ 4 ] );
- tran->t_pinfo.pi_stat.st_mtime = atoi( argv[ 5 ] );
+ tran->t_pinfo.pi_stat.st_mtime = strtotimet( argv[ 5 ], NULL, 10 );
tran->t_pinfo.pi_stat.st_size = strtoofft( argv[ 6 ], NULL, 10 );
if ( tran->t_type != T_NEGATIVE ) {
if (( cksum ) && ( strcmp( "-", argv [ 7 ] ) == 0 )) {
@@ -436,12 +439,13 @@ t_print( struct pathinfo *fs, struct tra
* but the corresponding transcript is negative, hence, retain
* the file system's mtime. Woof!
*/
- fprintf( outtran, "%c %-37s\t%.4lo %5d %5d %9d %7" PRIofft "d %s\n",
+ fprintf( outtran, "%c %-37s\t%.4lo %5d %5d %9" PRItimet "d "
+ "%7" PRIofft "d %s\n",
cur->pi_type, epath,
(unsigned long)( T_MODE & cur->pi_stat.st_mode ),
(int)cur->pi_stat.st_uid, (int)cur->pi_stat.st_gid,
( flag == PR_STATUS_NEG ) ?
- (int)fs->pi_stat.st_mtime : (int)cur->pi_stat.st_mtime,
+ fs->pi_stat.st_mtime : cur->pi_stat.st_mtime,
cur->pi_stat.st_size, cur->pi_cksum_b64 );
break;
|
