LFS fixes (explicit use of open64/etc)

[dump.git] / rmt / rmt.c

diff --git a/rmt/rmt.c b/rmt/rmt.c
index 590bbc4a840360dd8409236c45d3c907c0f63f37..e23d0a3f350c860a6c15efe68230d2058f2c933e 100644 (file)
--- 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@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@noos.fr>, 1999-2000
+ *     Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  */
 
 /*
@@ -37,30 +37,31 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $Id: rmt.c,v 1.5 1999/10/11 13:31:14 stelian Exp $
  */
 
+#ifndef lint
+static const char rcsid[] =
+       "$Id: rmt.c,v 1.14 2001/04/27 15:22:47 stelian Exp $";
+#endif /* not linux */
+
 /*
  * rmt
  */
+#include <config.h>
+#include <compatlfs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/mtio.h>
 #include <errno.h>
 #include <fcntl.h>
+#ifndef __linux__
 #include <sgtty.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#ifdef __linux__
-#include <linux/ext2_fs.h>
-#include <ext2fs/ext2fs.h>
-#include <bsdcompat.h>
-#endif
-
 int    tape = -1;
 
 char   *record;
@@ -87,6 +88,7 @@ main(int argc, char *argv[])
        int rval = 0;
        char c;
        int n, i, cc;
+       unsigned long block = 0;
 
        argc--, argv++;
        if (argc > 0) {
@@ -113,24 +115,26 @@ top:
                 * specify the permission bits; allow rw for everyone,
                 * as modified by the users umask
                 */
-               tape = open(device, atoi(filemode), 0666);
+               tape = OPEN(device, atoi(filemode), 0666);
                if (tape < 0)
                        goto ioerror;
+               block = 0;
                goto respond;
 
        case 'C':
-               DEBUG("rmtd: C\n");
+               DEBUG1("rmtd: C  (%lu blocks)\n", block);
                getstring(device);              /* discard */
                if (close(tape) < 0)
                        goto ioerror;
                tape = -1;
+               block = 0;
                goto respond;
 
        case 'L':
                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)atol(count), atoi(pos));
                if (rval < 0)
                        goto ioerror;
                goto respond;
@@ -138,7 +142,7 @@ top:
        case 'W':
                getstring(count);
                n = atoi(count);
-               DEBUG1("rmtd: W %s\n", count);
+               DEBUG2("rmtd: W %s (block = %lu)\n", count, block);
                record = checkbuf(record, n);
                for (i = 0; i < n; i += cc) {
                        cc = read(0, &record[i], n - i);
@@ -150,11 +154,12 @@ top:
                rval = write(tape, record, n);
                if (rval < 0)
                        goto ioerror;
+               block += n >> 10;
                goto respond;
 
        case 'R':
                getstring(count);
-               DEBUG1("rmtd: R %s\n", count);
+               DEBUG2("rmtd: R %s (block %lu)\n", count, block);
                n = atoi(count);
                record = checkbuf(record, n);
                rval = read(tape, record, n);
@@ -163,6 +168,7 @@ top:
                (void)sprintf(resp, "A%d\n", rval);
                (void)write(1, resp, strlen(resp));
                (void)write(1, record, rval);
+               block += n >> 10;
                goto top;
 
        case 'I':