* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
#ifndef lint
static const char rcsid[] =
- "$Id: rmt.c,v 1.19 2002/04/16 21:00:59 stelian Exp $";
+ "$Id: rmt.c,v 1.25 2003/03/31 10:09:41 stelian Exp $";
#endif /* not linux */
/*
*/
#include <config.h>
#include <compatlfs.h>
+#include <rmtflags.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/mtio.h>
int
main(int argc, char *argv[])
{
- int rval = 0;
+ OFF_T rval = 0;
char c;
- int n, i, cc;
+ int n, i, cc, oflags;
unsigned long block = 0;
argc--, argv++;
getstring(device);
getstring(filemode);
DEBUG2("rmtd: O %s %s\n", device, filemode);
+ /*
+ * Translate extended GNU syntax into its numeric platform equivalent
+ */
+ oflags = rmtflags_toint(filemode);
+#ifdef O_TEXT
+ /*
+ * Default to O_BINARY the client may not know that we need it.
+ */
+ if ((oflags & O_TEXT) == 0)
+ oflags |= O_BINARY;
+#endif
+ DEBUG2("rmtd: O %s %d\n", device, oflags);
/*
* XXX the rmt protocol does not provide a means to
* specify the permission bits; allow rw for everyone,
* as modified by the users umask
*/
- tape = OPEN(device, atoi(filemode), 0666);
+ tape = OPEN(device, oflags, 0666);
if (tape < 0)
goto ioerror;
block = 0;
getstring(count);
getstring(pos);
DEBUG2("rmtd: L %s %s\n", count, pos);
- rval = LSEEK(tape, (off_t)atol(count), atoi(pos));
+ rval = LSEEK(tape, (OFF_T)atoll(count), atoi(pos));
if (rval < 0)
goto ioerror;
goto respond;
case 'W':
getstring(count);
n = atoi(count);
+ if (n < 1)
+ exit(2);
DEBUG2("rmtd: W %s (block = %lu)\n", count, block);
record = checkbuf(record, n);
for (i = 0; i < n; i += cc) {
rval = read(tape, record, n);
if (rval < 0)
goto ioerror;
- (void)sprintf(resp, "A%d\n", rval);
+ (void)sprintf(resp, "A%lld\n", (long long)rval);
(void)write(1, resp, strlen(resp));
(void)write(1, record, rval);
block += n >> 10;
if (ioctl(tape, MTIOCGET, (char *)&mtget) < 0)
goto ioerror;
rval = sizeof (mtget);
- (void)sprintf(resp, "A%d\n", rval);
+ (void)sprintf(resp, "A%lld\n", (long long)rval);
(void)write(1, resp, strlen(resp));
(void)write(1, (char *)&mtget, sizeof (mtget));
goto top;
exit(3);
}
respond:
- DEBUG1("rmtd: A %d\n", rval);
- (void)sprintf(resp, "A%d\n", rval);
+ DEBUG1("rmtd: A %lld\n", (long long)rval);
+ (void)sprintf(resp, "A%lld\n", (long long)rval);
(void)write(1, resp, strlen(resp));
goto top;
ioerror:
int i;
char *cp = bp;
- for (i = 0; i < SSIZE; i++) {
+ for (i = 0; i < SSIZE - 1; i++) {
if (read(0, cp+i, 1) != 1)
exit(0);
if (cp[i] == '\n')