From 21c9a1e74f2d41897b1547dd6011eccfbf1a4af5 Mon Sep 17 00:00:00 2001
From: hades <hades>
Date: Mon, 22 May 2000 11:49:00 +0000
Subject: [PATCH] *** empty log message ***

---
 hadaq/ansiTape.c      | 22 ++++++++++++++++++++--
 hadaq/ansiTape.h      |  4 ----
 hadaq/ansiTapeLabel.c | 19 +++----------------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/hadaq/ansiTape.c b/hadaq/ansiTape.c
index 23e6b6b..c82ff84 100644
--- a/hadaq/ansiTape.c
+++ b/hadaq/ansiTape.c
@@ -24,11 +24,11 @@
 #include "ansiTape.h"
 
 AnsiTape *openAnsiTape(const char* filename) {
+#if defined(MTIOCTOP)
 	int tape;
 	int fileSeqNum = 0;
 	int stat;
 	int i = 0;
-
 	char *vol;
 	char *label;
 
@@ -43,7 +43,13 @@ AnsiTape *openAnsiTape(const char* filename) {
 		exit(-2);
 	}
 
+#if defined(MTEOM)
+	mtoper->mt_op = MTEOM;
+#elif defined(MTSEOD)
 	mtoper->mt_op = MTSEOD;
+#else
+#error Unknown ioctl operation
+#endif
 	mtoper->mt_count = 1;
 	stat = ioctl(tape, MTIOCTOP, mtoper);
 	if (stat == -1) {
@@ -138,9 +144,14 @@ AnsiTape *openAnsiTape(const char* filename) {
 	thisAnsiTape->fileSeqNum = fileSeqNum;
 
 	return thisAnsiTape;
+#else
+	return NULL;
+#endif
 }
 
-int writeAnsiTape(AnsiTape *openTape, const char *src, size_t size) {
+int writeAnsiTape(AnsiTape *openTape, const char *src, size_t size)
+{
+#if defined(MTIOCTOP)
 	int returnValue = 0;
 	while(size >= BLOCKSIZE - openTape->bufferFull) {
 		if (openTape->bufferFull < BLOCKSIZE) {
@@ -160,9 +171,13 @@ int writeAnsiTape(AnsiTape *openTape, const char *src, size_t size) {
 		returnValue += size;
 	}
 	return returnValue;
+#else
+	return -1;
+#endif
 }
 
 int closeAnsiTape(AnsiTape *openTape) {
+#if defined(MTIOCTOP)
 	int stat;
 	struct mtop mtoperS, *mtoper = &mtoperS;
 	if(openTape->bufferFull != 0) {
@@ -197,5 +212,8 @@ int closeAnsiTape(AnsiTape *openTape) {
 	}
 
 	return 0;
+#else
+	return -1;
+#endif
 }
 
diff --git a/hadaq/ansiTape.h b/hadaq/ansiTape.h
index 28b29ac..4442593 100644
--- a/hadaq/ansiTape.h
+++ b/hadaq/ansiTape.h
@@ -3,10 +3,6 @@
 
 #define BLOCKSIZE 8192
 
-#ifdef UNIX
-  #define MTEOM MTSEOD
-#endif
-
 typedef struct AnsiTapeS {
 	int fd;
 
diff --git a/hadaq/ansiTapeLabel.c b/hadaq/ansiTapeLabel.c
index bd037bf..c9cd1cd 100644
--- a/hadaq/ansiTapeLabel.c
+++ b/hadaq/ansiTapeLabel.c
@@ -55,12 +55,7 @@ int writeNewVolumeLabel(const char *volId, const char *ownerId, int tape) {
 	char *vol, *oid;
 	int stat;
 
-#ifidef LINUX
-	const char *impId = "LINUXHADAQ023";
-#endif
-#ifdef UNIX
-	const char *impId = "UNIXHADAQ0023";
-#endif
+	const char *impId = "    HADAQ0023";
 
 	vol = allocMem(80*sizeof(char));
 
@@ -91,17 +86,9 @@ int writeLabel(const char *hdreof, int tape, int fileSeqNum, int bytes, const ch
 	char *creaCent;
 	char label[81];
 	char fn[37];
-#ifdef LINUX
-	const char *impId = "LINUXHADAQ023";
-#endif
-#ifdef UNIX
-	const char *impId = "UNIXHADAQ0023";
-#endif
-#ifndef LINUX
-  #ifndef UNIX
+
 	const char *impId = "    HADAQ0023";
-  #endif
-#endif
+
 	uid_t uid;
 	char *user;
 	time_t tim;
-- 
2.43.0