Added O_BINARY for open calls.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
- * Revision 1.46 1997-07-28 08:30:47 adam
+ * Revision 1.47 1997-09-04 13:58:36 adam
+ * New retrieve/extract method tellf (added).
+ * Added O_BINARY for open calls.
+ *
+ * Revision 1.46 1997/07/28 08:30:47 adam
* Server returns diagnostic 14 when record doesn't exist.
*
* Revision 1.45 1996/12/23 15:30:45 adam
* Server returns diagnostic 14 when record doesn't exist.
*
* Revision 1.45 1996/12/23 15:30:45 adam
return lseek (*((int*) fh), offset + record_offset, SEEK_SET);
}
return lseek (*((int*) fh), offset + record_offset, SEEK_SET);
}
+static off_t record_ext_tell (void *fh)
+{
+ return lseek (*((int*) fh), 0, SEEK_CUR) - record_offset;
+}
+
static int record_int_pos;
static char *record_int_buf;
static int record_int_len;
static int record_int_pos;
static char *record_int_buf;
static int record_int_len;
return (off_t) (record_int_pos = offset);
}
return (off_t) (record_int_pos = offset);
}
+static off_t record_int_tell (void *fh)
+{
+ return (off_t) record_int_pos;
+}
+
static int record_int_read (void *fh, char *buf, size_t count)
{
int l = record_int_len - record_int_pos;
static int record_int_read (void *fh, char *buf, size_t count)
{
int l = record_int_len - record_int_pos;
{
retrieveCtrl.readf = record_int_read;
retrieveCtrl.seekf = record_int_seek;
{
retrieveCtrl.readf = record_int_read;
retrieveCtrl.seekf = record_int_seek;
+ retrieveCtrl.tellf = record_int_tell;
record_int_len = rec->size[recInfo_storeData];
record_int_buf = rec->info[recInfo_storeData];
record_int_pos = 0;
record_int_len = rec->size[recInfo_storeData];
record_int_buf = rec->info[recInfo_storeData];
record_int_pos = 0;
- if ((fd = open (fname, O_RDONLY)) == -1)
+ if ((fd = open (fname, O_BINARY|O_RDONLY)) == -1)
{
logf (LOG_WARN|LOG_ERRNO, "Retrieve fail; missing file: %s",
fname);
{
logf (LOG_WARN|LOG_ERRNO, "Retrieve fail; missing file: %s",
fname);
retrieveCtrl.fh = &fd;
retrieveCtrl.readf = record_ext_read;
retrieveCtrl.seekf = record_ext_seek;
retrieveCtrl.fh = &fd;
retrieveCtrl.readf = record_ext_read;
retrieveCtrl.seekf = record_ext_seek;
+ retrieveCtrl.tellf = record_ext_tell;
record_ext_seek (retrieveCtrl.fh, 0);
}
record_ext_seek (retrieveCtrl.fh, 0);
}