~mdw
/
sgt
/
agedu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Portability enhancements to make better use of autoconf. All system
[sgt/agedu]
/
agedu.c
diff --git
a/agedu.c
b/agedu.c
index
c3ac6a7
..
1a68eb4
100644
(file)
--- a/
agedu.c
+++ b/
agedu.c
@@
-2,25
+2,8
@@
* Main program for agedu.
*/
* Main program for agedu.
*/
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <time.h>
-#include <assert.h>
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <fnmatch.h>
-
#include "agedu.h"
#include "agedu.h"
+
#include "du.h"
#include "trie.h"
#include "index.h"
#include "du.h"
#include "trie.h"
#include "index.h"
@@
-1033,8
+1016,8
@@
int main(int argc, char **argv)
return 1;
}
return 1;
}
- printf("Built pathname index, %d entries, %
j
u bytes\n", count,
- (
intmax_t
)st.st_size);
+ printf("Built pathname index, %d entries, %
ll
u bytes\n", count,
+ (
unsigned long long
)st.st_size);
totalsize = index_compute_size(st.st_size, count);
totalsize = index_compute_size(st.st_size, count);
@@
-1047,8
+1030,8
@@
int main(int argc, char **argv)
return 1;
}
return 1;
}
- printf("Upper bound on index file size = %
j
u bytes\n",
- (
intmax_t
)totalsize);
+ printf("Upper bound on index file size = %
ll
u bytes\n",
+ (
unsigned long long
)totalsize);
mappedfile = mmap(NULL, totalsize, PROT_READ|PROT_WRITE,MAP_SHARED, fd, 0);
if (!mappedfile) {
mappedfile = mmap(NULL, totalsize, PROT_READ|PROT_WRITE,MAP_SHARED, fd, 0);
if (!mappedfile) {
@@
-1073,7
+1056,8
@@
int main(int argc, char **argv)
munmap(mappedfile, totalsize);
ftruncate(fd, realsize);
close(fd);
munmap(mappedfile, totalsize);
ftruncate(fd, realsize);
close(fd);
- printf("Actual index file size = %ju bytes\n", (intmax_t)realsize);
+ printf("Actual index file size = %llu bytes\n",
+ (unsigned long long)realsize);
}
} else if (mode == TEXT) {
char *querydir = actions[action].arg;
}
} else if (mode == TEXT) {
char *querydir = actions[action].arg;