X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=rmt%2Frmt.c;h=fc6eb827f4788c0c60b878f918c1eb0fc0e394b8;hb=1c736b782dfb4cf419bc53bcc795537585a283bc;hp=bde137dcd17b101e14d9094c920a135678ca857b;hpb=5a7167e93a7975616f2f3fb4bc48b3fbd8080672;p=dump.git

diff --git a/rmt/rmt.c b/rmt/rmt.c
index bde137d..fc6eb82 100644
--- a/rmt/rmt.c
+++ b/rmt/rmt.c
@@ -2,8 +2,8 @@
  *	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
  */
 
 /*
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rmt.c,v 1.15 2001/05/26 11:11:16 stelian Exp $";
+	"$Id: rmt.c,v 1.21 2002/07/29 12:00:34 stelian Exp $";
 #endif /* not linux */
 
 /*
@@ -49,6 +49,7 @@ static const char rcsid[] =
  */
 #include <config.h>
 #include <compatlfs.h>
+#include <rmtflags.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/mtio.h>
@@ -62,45 +63,57 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 
-int	tape = -1;
+static int	tape = -1;
 
-char	*record;
-int	maxrecsize = -1;
+static char	*record;
+static int	maxrecsize = -1;
 
 #define	SSIZE	64
-char	device[SSIZE];
-char	count[SSIZE], filemode[SSIZE], pos[SSIZE], op[SSIZE];
+static char	device[SSIZE];
+static char	count[SSIZE], filemode[SSIZE], pos[SSIZE], op[SSIZE];
 
-char	resp[BUFSIZ];
+static char	resp[BUFSIZ];
 
-FILE	*debug;
+static FILE	*debug;
 #define	DEBUG(f)	if (debug) fprintf(debug, f)
 #define	DEBUG1(f,a)	if (debug) fprintf(debug, f, a)
 #define	DEBUG2(f,a1,a2)	if (debug) fprintf(debug, f, a1, a2)
 
 /*
  * Support for Sun's extended RMT protocol
+ * 	code originally written by Jörg Schilling <schilling@fokus.gmd.de>
+ * 	and relicensed by his permission from GPL to BSD for use in dump.
+ *
+ * 	rmt_version is 0 for regular clients (Linux included)
+ * 	rmt_version is 1 for extended clients (Sun especially). In this case
+ * 		we support some extended commands (see below) and we remap
+ * 		the ioctl commands to the UNIX "standard", as per:
+ * 			ftp://ftp.fokus.gmd.de/pub/unix/star/README.mtio
+ *
+ * 	In order to use rmt version 1, a client must send "I-1\n0\n" 
+ * 	before issuing the other I commands.
  */
-#define RMTI_VERSION    -1
-#define RMT_VERSION 1
+static int	rmt_version = 0;
+#define RMTI_VERSION	-1
+#define RMT_VERSION 	1
  
 /* Extended 'i' commands */
-#define RMTI_CACHE  0
-#define RMTI_NOCACHE    1
-#define RMTI_RETEN  2
-#define RMTI_ERASE  3
-#define RMTI_EOM    4
-#define RMTI_NBSF   5
+#define RMTI_CACHE	0
+#define RMTI_NOCACHE	1
+#define RMTI_RETEN	2
+#define RMTI_ERASE	3
+#define RMTI_EOM	4
+#define RMTI_NBSF	5
  
 /* Extended 's' comands */
-#define MTS_TYPE    'T'
-#define MTS_DSREG   'D'
-#define MTS_ERREG   'E'
-#define MTS_RESID   'R'
-#define MTS_FILENO  'F'
-#define MTS_BLKNO   'B'
-#define MTS_FLAGS   'f'
-#define MTS_BF      'b'
+#define MTS_TYPE	'T'
+#define MTS_DSREG	'D'
+#define MTS_ERREG	'E'
+#define MTS_RESID	'R'
+#define MTS_FILENO	'F'
+#define MTS_BLKNO	'B'
+#define MTS_FLAGS	'f'
+#define MTS_BF		'b'
 
 char	*checkbuf __P((char *, int));
 void	 error __P((int));
@@ -111,7 +124,7 @@ main(int argc, char *argv[])
 {
 	int rval = 0;
 	char c;
-	int n, i, cc;
+	int n, i, cc, oflags;
 	unsigned long block = 0;
 
 	argc--, argv++;
@@ -134,12 +147,24 @@ top:
 		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;
@@ -201,13 +226,68 @@ top:
 		DEBUG2("rmtd: I %s %s\n", op, count);
 		if (atoi(op) == RMTI_VERSION) {
 			rval = RMT_VERSION;
-		} else { 
-		  struct mtop mtop;
-		  mtop.mt_op = atoi(op);
-		  mtop.mt_count = atoi(count);
-		  if (ioctl(tape, MTIOCTOP, (char *)&mtop) < 0)
-			goto ioerror;
-		  rval = mtop.mt_count;
+			rmt_version = 1;
+		} 
+		else { 
+			struct mtop mtop;
+			mtop.mt_op = -1;
+			if (rmt_version) {
+				/* rmt version 1, assume UNIX client */
+				switch (atoi(op)) {
+#ifdef  MTWEOF
+					case 0:
+						mtop.mt_op = MTWEOF;
+						break;
+#endif
+#ifdef  MTFSF
+					case 1:
+						mtop.mt_op = MTFSF;
+						break;
+#endif
+#ifdef  MTBSF
+					case 2:
+						mtop.mt_op = MTBSF;
+						break;
+#endif
+#ifdef  MTFSR
+					case 3:
+						mtop.mt_op = MTFSR;
+						break;
+#endif
+#ifdef  MTBSR
+					case 4:
+						mtop.mt_op = MTBSR;
+						break;
+#endif
+#ifdef  MTREW
+					case 5:
+						mtop.mt_op = MTREW;
+						break;
+#endif
+#ifdef  MTOFFL
+					case 6:
+						mtop.mt_op = MTOFFL;
+						break;
+#endif
+#ifdef  MTNOP
+					case 7:
+						mtop.mt_op = MTNOP;
+						break;
+#endif
+				}
+				if (mtop.mt_op == -1) {
+					errno = EINVAL;
+					goto ioerror;
+				}
+			}
+			else {
+				/* rmt version 0, assume linux client */
+				mtop.mt_op = atoi(op);
+			}
+			mtop.mt_count = atoi(count);
+			if (ioctl(tape, MTIOCTOP, (char *)&mtop) < 0)
+				goto ioerror;
+			rval = mtop.mt_count;
 		}
 		goto respond;