summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/file.c
diff options
context:
space:
mode:
authorVadim Zhukov <zhuk@cvs.openbsd.org>2013-12-13 15:19:42 +0000
committerVadim Zhukov <zhuk@cvs.openbsd.org>2013-12-13 15:19:42 +0000
commit155f2b5217f9830fa94bd3d318136292d2f4bd84 (patch)
tree24be3b27e409de1ff566b41fcc9bf88988469d73 /usr.bin/cvs/file.c
parentb7df9aead2070e2a23623e3637d8519b98cd5807 (diff)
Make it compile again. And there is a time_t fix as a bonus!
Input and okay jca@.
Diffstat (limited to 'usr.bin/cvs/file.c')
-rw-r--r--usr.bin/cvs/file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c
index 632f5f37c5d..be038b9fc50 100644
--- a/usr.bin/cvs/file.c
+++ b/usr.bin/cvs/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.262 2010/10/28 15:02:41 millert Exp $ */
+/* $OpenBSD: file.c,v 1.263 2013/12/13 15:19:41 zhuk Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
@@ -30,6 +30,7 @@
#include <sys/stat.h>
#include <sys/time.h>
+#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
#include <fnmatch.h>
@@ -393,7 +394,6 @@ cvs_file_walkdir(struct cvs_file *cf, struct cvs_recursion *cr)
int l, type;
FILE *fp;
int nbytes;
- off_t base;
size_t bufsize;
struct stat st;
struct dirent *dp;
@@ -472,7 +472,7 @@ cvs_file_walkdir(struct cvs_file *cf, struct cvs_recursion *cr)
RB_INIT(&fl);
RB_INIT(&dl);
- while ((nbytes = getdirentries(cf->fd, buf, bufsize, &base)) > 0) {
+ while ((nbytes = getdents(cf->fd, buf, bufsize)) > 0) {
ebuf = buf + nbytes;
cp = buf;