* Sebastian Hammer, Adam Dickmeiss
*
* $Log: extract.c,v $
- * Revision 1.13 1995-09-29 14:01:39 adam
+ * Revision 1.15 1995-10-02 15:42:53 adam
+ * Extract uses file descriptors instead of FILE pointers.
+ *
+ * Revision 1.14 1995/10/02 15:29:13 adam
+ * More logging in file_extract.
+ *
+ * Revision 1.13 1995/09/29 14:01:39 adam
* Bug fixes.
*
* Revision 1.12 1995/09/28 14:22:56 adam
kused += sizeof(key);
}
+static int file_read (int fd, char *buf, size_t count)
+{
+ return read (fd, buf, count);
+}
+
void file_extract (int cmd, const char *fname, const char *kname)
{
- int i;
+ int i, r;
char ext[128];
SYSNO sysno;
char ext_res[128];
const char *file_type;
void *file_info;
- FILE *inf;
struct recExtractCtrl extractCtrl;
RecType rt;
- logf (LOG_DEBUG, "%c %s k=%s", cmd, fname, kname);
for (i = strlen(fname); --i >= 0; )
if (fname[i] == '/')
{
return;
if (!(rt = recType_byName (file_type)))
return;
+ logf (LOG_DEBUG, "%c %s k=%s", cmd, fname, kname);
file_info = dict_lookup (file_idx, kname);
if (!file_info)
{
else
memcpy (&sysno, (char*) file_info+1, sizeof(sysno));
- if (!(inf = fopen (fname, "r")))
+ if ((extractCtrl.fd = open (fname, O_RDONLY)) == -1)
{
logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
return;
}
- extractCtrl.inf = inf;
extractCtrl.subType = "";
extractCtrl.init = wordInit;
extractCtrl.add = wordAdd;
+ extractCtrl.readf = file_read;
key_sysno = sysno;
key_cmd = cmd;
- (*rt->extract)(&extractCtrl);
- fclose (inf);
+ r = (*rt->extract)(&extractCtrl);
+ close (extractCtrl.fd);
+ if (r)
+ logf (LOG_WARN, "Couldn't extract file %s, code %d", fname, r);
}