Don't use FILE * in mdfile.

diff --git a/ChangeLog b/ChangeLog
index 8aee47d1936708a57ff343e8af09df97fb101f4a..e9ee6f72e6be2156ac4cdc8d451e376ee5f93772 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 25 00:46:47 CST 2000 Adam Heath <doogie@debian.org>
+
+  * utils/md5sum.c: Don't use FILE * in mdfile.
+
 Mon Dec 25 00:31:05 CST 2000 Adam Heath <doogie@debian.org>
 
   * include/dpkg.h.in, lib/mlib.c: Added generic setup code to buffer

diff --git a/po/dpkg.pot b/po/dpkg.pot
index eee8ca58e4e875d3fbd71c1e4d86b7bd90de91fa..d12390361477bc76699c397e664ddbc1057b9096 100644 (file)
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-25 00:29-0600\n"
+"POT-Creation-Date: 2000-12-25 00:44-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/utils/md5sum.c b/utils/md5sum.c
index de39960d4e6f2eb624b4849f1dd0802ac54e9460..68f8f06a5f4bf6a3c712bdcde4be564c57892180 100644 (file)
--- a/utils/md5sum.c
+++ b/utils/md5sum.c
@@ -61,7 +61,7 @@ const char thisname[]= MD5SUM;
 
 void usage(void);
 void print_digest(unsigned char *p);
-int mdfile(FILE *fp, unsigned char *digest);
+int mdfile(int fd, unsigned char *digest);
 int do_check(FILE *chkf);
 int hex_digit(int c);
 int get_md5_line(FILE *fp, unsigned char *digest, char *file);
@@ -106,7 +106,7 @@ main(int argc, char **argv)
                exit(do_check(fp));
        }
        if (argc == 0) {
-               if (mdfile(stdin, digest)) {
+               if (mdfile(fileno(stdin), digest)) {
                        fprintf(stderr, _("%s: read error on stdin\n"), progname);
                        exit(2);
                }
@@ -123,7 +123,7 @@ main(int argc, char **argv)
                        rc = 2;
                        continue;
                }
-               if (mdfile(fp, digest)) {
+               if (mdfile(fileno(fp), digest)) {
                        fprintf(stderr, _("%s: error reading %s\n"), progname, *argv);
                        rc = 2;
                } else {
@@ -148,9 +148,9 @@ that is printed on stdout by this program when it generates digests.\n"), stderr
 }
 
 int
-mdfile(FILE *fp, unsigned char *digest)
+mdfile(int fd, unsigned char *digest)
 {
-       ssize_t ret = stream_md5(fp, digest, -1, _("mdfile"));
+       ssize_t ret = fd_md5(fd, digest, -1, _("mdfile"));
        if ( ret >= 0 )
                return 0;
        else
@@ -233,7 +233,7 @@ do_check(FILE *chkf)
                        ex = 2;
                        continue;
                }
-               if (mdfile(fp, file_digest)) {
+               if (mdfile(fileno(fp), file_digest)) {
                        fprintf(stderr, _("%s: error reading %s\n"), progname, filename);
                        ex = 2;
                        fclose(fp);