* Ported to Linux's Second Extended File System as part of the
* dump and restore backup suit
* Remy Card <card@Linux.EU.Org>, 1994-1997
- * Stelian Pop <pop@noos.fr>, 1999-2000
- * Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
+ * Stelian Pop <stelian@popies.net>, 1999-2000
+ * Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
*/
/*-
* 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: dumprmt.c,v 1.18 2001/08/13 16:17:52 stelian Exp $";
+ "$Id: dumprmt.c,v 1.28 2003/10/26 16:05:45 stelian Exp $";
#endif /* not lint */
#include <config.h>
#include <sys/mtio.h>
#include <sys/socket.h>
#include <sys/time.h>
+#include <fcntl.h>
#ifdef __linux__
#include <sys/types.h>
#ifdef HAVE_EXT2FS_EXT2_FS_H
#include <ctype.h>
#include <errno.h>
#include <compaterr.h>
+#include <rmtflags.h>
#include <netdb.h>
#include <pwd.h>
#include <stdio.h>
static const char *rmtpeer = 0;
static int okname __P((const char *));
-static int rmtcall __P((const char *, const char *));
+static OFF_T rmtcall __P((const char *, const char *));
static void rmtconnaborted __P((int));
static int rmtgetb __P((void));
static int rmtgetconn __P((void));
static void rmtgets __P((char *, size_t));
-static int rmtreply __P((const char *));
+static OFF_T rmtreply __P((const char *));
static int piped_child __P((const char **command));
#ifdef KERBEROS
int krcmd __P((char **, int /*u_short*/, char *, char *, int *, char *));
static int errfd = -1;
extern int dokerberos;
extern int ntrec; /* blocking factor on tape */
+extern int abortifconnerr; /* set to 1 if this lib should exit on connection errors
+ otherwise just print a message using msg */
#ifndef errno
extern int errno;
#endif
}
static void
-rmtconnaborted(int signo)
+rmtconnaborted(UNUSED(int signo))
{
msg("Lost connection to remote host.\n");
if (errfd != -1) {
}
}
}
-
- exit(X_ABORT);
+ if (abortifconnerr)
+ exit(X_ABORT);
}
static int
rmtgetconn(void)
{
- register char *cp;
- register const char *rmt;
+ char *cp;
+ const char *rmt;
static struct servent *sp = NULL;
static struct passwd *pwd = NULL;
const char *tuser;
if (!rsh && sp == NULL) {
sp = getservbyname(dokerberos ? "kshell" : "shell", "tcp");
- if (sp == NULL)
- errx(1, "%s/tcp: unknown service",
- dokerberos ? "kshell" : "shell");
+ if (sp == NULL) {
+ if (abortifconnerr) {
+ errx(1, "%s/tcp: unknown service", dokerberos ? "kshell" : "shell");
+ } else {
+ msg("%s/tcp: unknown service", dokerberos ? "kshell" : "shell");
+ return 0;
+ }
+ }
}
if (pwd == NULL) {
pwd = getpwuid(getuid());
- if (pwd == NULL)
- errx(1, "who are you?");
+ if (pwd == NULL) {
+ if (abortifconnerr) {
+ errx(1, "who are you?");
+ } else {
+ msg("who are you?");
+ return 0;
+ }
+ }
}
if ((cp = strchr(rmtpeer, '@')) != NULL) {
tuser = rmtpeer;
*cp = '\0';
- if (!okname(tuser))
- exit(X_STARTUP);
+ if (!okname(tuser)) {
+ if (abortifconnerr) {
+ exit(X_STARTUP);
+ } else {
+ return 0;
+ }
+ }
rmtpeer = ++cp;
} else
tuser = pwd->pw_name;
perror("TCP_NODELAY setsockopt");
fromrmtape = tormtape;
}
- (void)fprintf(stderr, "Connection to %s established.\n", rmtpeer);
+ (void)fprintf(stdout, "Connection to %s established.\n", rmtpeer);
return 1;
}
static int
okname(const char *cp0)
{
- register const char *cp;
- register int c;
+ const char *cp;
+ int c;
for (cp = cp0; *cp; cp++) {
c = *cp;
}
int
-rmtopen(const char *tape, int mode)
+rmtopen(const char *tape, const int mode)
{
char buf[MAXPATHLEN];
-
- (void)snprintf(buf, sizeof (buf), "O%s\n%d\n", tape, mode);
+ char *rmtflags;
+
+ rmtflags = rmtflags_tochar(mode);
+ (void)snprintf(buf, sizeof (buf), "O%s\n%d %s\n",
+ tape,
+ mode & O_ACCMODE,
+ rmtflags);
+ free(rmtflags);
rmtstate = TS_OPEN;
return (rmtcall(tape, buf));
}
(void)snprintf(line, sizeof (line), "R%u\n", (unsigned)count);
n = rmtcall("read", line);
- if (n < 0)
+ if (n < 0) {
/* rmtcall() properly sets errno for us on errors. */
- return (n);
+ errno = n;
+ return (-1);
+ }
for (i = 0; i < n; i += cc) {
cc = read(fromrmtape, buf+i, n - i);
if (cc <= 0)
return (rmtreply("write"));
}
-int
-rmtseek(int offset, int pos)
+OFF_T
+rmtseek(OFF_T offset, int pos)
{
char line[80];
- (void)snprintf(line, sizeof (line), "L%d\n%d\n", offset, pos);
+ (void)snprintf(line, sizeof (line), "L%lld\n%d\n", (long long)offset, pos);
return (rmtcall("seek", line));
}
struct mtget *
rmtstatus(void)
{
- register int i;
- register char *cp;
+ int i;
+ char *cp;
if (rmtstate != TS_OPEN)
return (NULL);
- rmtcall("status", "S\n");
- for (i = 0, cp = (char *)&mts; i < sizeof(mts); i++)
+ i = rmtcall("status", "S");
+ if (i < 0) return NULL;
+ if (i != (int)sizeof(mts)) {
+ msg("mtget sizes different between host (%d) "
+ "and remote tape (%d)", sizeof(mts), i);
+ for ( /* empty */; i > 0; --i)
+ rmtgetb();
+ return NULL;
+ }
+ for (i = 0, cp = (char *)&mts; i < (int)sizeof(mts); i++)
*cp++ = rmtgetb();
return (&mts);
}
return (rmtcall("ioctl", buf));
}
-static int
+static OFF_T
rmtcall(const char *cmd, const char *buf)
{
- if (write(tormtape, buf, strlen(buf)) != strlen(buf))
+ if (write(tormtape, buf, strlen(buf)) != (ssize_t)strlen(buf))
rmtconnaborted(0);
return (rmtreply(cmd));
}
-static int
+static OFF_T
rmtreply(const char *cmd)
{
- register char *cp;
+ char *cp;
char code[30], emsg[BUFSIZ];
rmtgets(code, sizeof (code));
code);
rmtconnaborted(0);
}
- return (atoi(code + 1));
+ return (OFF_T)(atoll(code + 1));
}
static int
static void
rmtgets(char *line, size_t len)
{
- register char *cp = line;
+ char *cp = line;
while (len > 1) {
*cp = rmtgetb();
git.wh0rd.org / dump.git / blobdiff