* 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@cybercable.fr>, 1999-2000
- * Stelian Pop <pop@cybercable.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
*/
/*-
#ifndef lint
static const char rcsid[] =
- "$Id: dumprmt.c,v 1.13 2000/11/10 14:42:24 stelian Exp $";
+ "$Id: dumprmt.c,v 1.20 2002/01/25 15:08:59 stelian Exp $";
#endif /* not lint */
-#ifdef __linux__
-#include <sys/types.h>
-#include <linux/types.h>
-#endif
+#include <config.h>
#include <sys/param.h>
#include <sys/mtio.h>
#include <sys/socket.h>
#include <sys/time.h>
#ifdef __linux__
+#include <sys/types.h>
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
#include <linux/ext2_fs.h>
+#endif
#include <bsdcompat.h>
#include <signal.h>
-#else
-#ifdef sunos
+#elif defined sunos
#include <sys/vnode.h>
#include <ufs/inode.h>
#else
#include <ufs/ufs/dinode.h>
#endif
-#endif
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <ext2fs/ext2fs.h>
#endif
-#include "pathnames.h"
-#include "dump.h"
+#include <pathnames.h>
+#include "dump.h" /* for X_STARTUP, X_ABORT etc */
#define TS_CLOSED 0
#define TS_OPEN 1
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;
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;
{
char line[30];
- (void)snprintf(line, sizeof (line), "W%d\n", count);
+ (void)snprintf(line, sizeof (line), "W%ld\n", (long)count);
write(tormtape, line, strlen(line));
write(tormtape, buf, count);
return (rmtreply("write"));
struct mtget *
rmtstatus(void)
{
- register int i;
- register char *cp;
+ int i;
+ char *cp;
if (rmtstate != TS_OPEN)
return (NULL);
static int
rmtreply(const char *cmd)
{
- register char *cp;
+ char *cp;
char code[30], emsg[BUFSIZ];
rmtgets(code, sizeof (code));
static void
rmtgets(char *line, size_t len)
{
- register char *cp = line;
+ char *cp = line;
while (len > 1) {
*cp = rmtgetb();