/* Remote connection server.
- Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+ Copyright 1994, 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* Copyright (C) 1983 Regents of the University of California.
All rights reserved.
MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */
#include "system.h"
+#include "safe-read.h"
#include <sys/socket.h>
static char *
private_strerror (int errnum)
{
- extern const char *const sys_errlist[];
+ extern char *sys_errlist[];
extern int sys_nerr;
if (errnum > 0 && errnum <= sys_nerr)
- return sys_errlist[errnum];
- return N_("Unknown system error");
+ return _(sys_errlist[errnum]);
+ return _("Unknown system error");
}
# define strerror private_strerror
#endif
DEBUG1 ("rmtd: E 0 (%s)\n", string);
sprintf (reply_buffer, "E0\n%s\n", string);
- write (1, reply_buffer, strlen (reply_buffer));
+ full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer));
}
/*---.
DEBUG2 ("rmtd: E %d (%s)\n", num, strerror (num));
sprintf (reply_buffer, "E%d\n%s\n", num, strerror (num));
- write (1, reply_buffer, strlen (reply_buffer));
+ full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer));
}
/*---.
for (counter = 0; counter < STRING_SIZE; counter++)
{
- if (read (0, string + counter, 1) != 1)
+ if (safe_read (STDIN_FILENO, string + counter, 1) != 1)
exit (EXIT_SUCCESS);
if (string[counter] == '\n')
#ifdef SO_RCVBUF
while (size > 1024 &&
- setsockopt (0, SOL_SOCKET, SO_RCVBUF, (char *) &size, sizeof (size)) < 0)
+ (setsockopt (STDIN_FILENO, SOL_SOCKET, SO_RCVBUF,
+ (char *) &size, sizeof size)
+ < 0))
size -= 1024;
#else
/* FIXME: I do not see any purpose to the following line... Sigh! */
top:
errno = 0; /* FIXME: errno should be read-only */
status = 0;
- if (read (0, &command, 1) != 1)
+ if (safe_read (STDIN_FILENO, &command, 1) != 1)
exit (EXIT_SUCCESS);
switch (command)
if (tape >= 0)
close (tape);
-#if defined (i386) && defined (AIX)
-
- /* This is alleged to fix a byte ordering problem. I'm quite
- suspicious if it's right. -- mib. */
-
- {
- mode_t old_mode = atol (mode_string);
- mode_t new_mode = 0;
-
- if ((old_mode & 3) == 0)
- new_mode |= O_RDONLY;
- if (old_mode & 1)
- new_mode |= O_WRONLY;
- if (old_mode & 2)
- new_mode |= O_RDWR;
- if (old_mode & 0x0008)
- new_mode |= O_APPEND;
- if (old_mode & 0x0200)
- new_mode |= O_CREAT;
- if (old_mode & 0x0400)
- new_mode |= O_TRUNC;
- if (old_mode & 0x0800)
- new_mode |= O_EXCL;
- tape = open (device_string, new_mode, 0666);
- }
-#else
tape = open (device_string, atoi (mode_string), 0666);
-#endif
if (tape < 0)
goto ioerror;
goto respond;
char position_string[STRING_SIZE];
off_t count = 0;
int negative;
+ int whence;
char *p;
get_string (count_string);
}
}
- count = lseek (tape, count, atoi (position_string));
+ switch (atoi (position_string))
+ {
+ case 0: whence = SEEK_SET; break;
+ case 1: whence = SEEK_CUR; break;
+ case 2: whence = SEEK_END; break;
+ default:
+ report_error_message (N_("Seek direction out of range"));
+ exit (EXIT_FAILURE);
+ }
+ count = lseek (tape, count, whence);
if (count < 0)
goto ioerror;
DEBUG1 ("rmtd: A %s\n", p);
sprintf (reply_buffer, "A%s\n", p);
- write (1, reply_buffer, strlen (reply_buffer));
+ full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer));
goto top;
}
prepare_record_buffer (size);
for (counter = 0; counter < size; counter += status)
{
- status = read (0, &record_buffer[counter], size - counter);
+ status = safe_read (STDIN_FILENO, &record_buffer[counter],
+ size - counter);
if (status <= 0)
{
DEBUG (_("rmtd: Premature eof\n"));
exit (EXIT_FAILURE); /* exit status used to be 2 */
}
}
- status = write (tape, record_buffer, size);
+ status = full_write (tape, record_buffer, size);
if (status < 0)
goto ioerror;
goto respond;
size = atol (count_string);
prepare_record_buffer (size);
- status = read (tape, record_buffer, size);
+ status = safe_read (tape, record_buffer, size);
if (status < 0)
goto ioerror;
sprintf (reply_buffer, "A%ld\n", status);
- write (1, reply_buffer, strlen (reply_buffer));
- write (1, record_buffer, (size_t) status);
+ full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer));
+ full_write (STDOUT_FILENO, record_buffer, (size_t) status);
goto top;
}
{
struct mtop mtop;
const char *p;
- daddr_t count = 0;
+ off_t count = 0;
int negative;
/* Parse count_string, taking care to check for overflow.
We can't use standard functions,
- since daddr_t might be longer than long. */
+ since off_t might be longer than long. */
for (p = count_string; *p == ' ' || *p == '\t'; p++)
continue;
break;
else
{
- daddr_t c10 = 10 * count;
- daddr_t nc = negative ? c10 - digit : c10 + digit;
+ off_t c10 = 10 * count;
+ off_t nc = negative ? c10 - digit : c10 + digit;
if (c10 / 10 != count || (negative ? c10 < nc : nc < c10))
{
report_error_message (N_("Seek offset out of range"));
}
mtop.mt_count = count;
+ if (mtop.mt_count != count)
+ {
+ report_error_message (N_("Seek offset out of range"));
+ exit (EXIT_FAILURE);
+ }
mtop.mt_op = atoi (operation_string);
if (ioctl (tape, MTIOCTOP, (char *) &mtop) < 0)
goto ioerror;
status = sizeof (operation);
sprintf (reply_buffer, "A%ld\n", status);
- write (1, reply_buffer, strlen (reply_buffer));
- write (1, (char *) &operation, sizeof (operation));
+ full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer));
+ full_write (STDOUT_FILENO, (char *) &operation, sizeof (operation));
}
#endif
goto top;
DEBUG1 ("rmtd: A %ld\n", status);
sprintf (reply_buffer, "A%ld\n", status);
- write (1, reply_buffer, strlen (reply_buffer));
+ full_write (STDOUT_FILENO, reply_buffer, strlen (reply_buffer));
goto top;
ioerror:
projects / chaz / tar / blobdiff