diff options
Diffstat (limited to 'sysutils/amanda-server/patches/patch-ai')
| -rw-r--r-- | sysutils/amanda-server/patches/patch-ai | 195 |
1 files changed, 31 insertions, 164 deletions
diff --git a/sysutils/amanda-server/patches/patch-ai b/sysutils/amanda-server/patches/patch-ai index a3b9547e839..b7f5959e863 100644 --- a/sysutils/amanda-server/patches/patch-ai +++ b/sysutils/amanda-server/patches/patch-ai @@ -1,164 +1,31 @@ -$NetBSD: patch-ai,v 1.2 2000/03/16 13:58:48 wiz Exp $ ---- changer-src/scsi-chio.c.orig Wed Jul 8 00:04:04 1998 -+++ changer-src/scsi-chio.c Mon Mar 6 15:26:26 2000 -@@ -119,25 +119,41 @@ - */ - int isempty(int fd, int slot) - { -+#if defined(OCHIOGSTATUS) -+struct ochanger_element_status_request cesr; -+#else - struct changer_element_status ces; -+#endif -+ - int i,rc; - int type=CHET_ST; - - get_changer_info(fd); - -+#if defined(OCHIOGSTATUS) -+ cesr.cesr_type = type; -+ cesr.cesr_data = malloc(changer_info.cp_nslots); -+ rc = ioctl(fd, OCHIOGSTATUS, &cesr); -+#else - ces.ces_type = type; - ces.ces_data = malloc(changer_info.cp_nslots); -- - rc = ioctl(fd, CHIOGSTATUS, &ces); -+#endif -+ - if (rc) { - fprintf(stderr,"%s: changer status query failed: 0x%x %s\n", - get_pname(), rc,strerror(errno)); - return -1; - } - -+#if defined(OCHIOGSTATUS) -+ i = cesr.cesr_data[slot] & CESTATUS_FULL; -+ free(cesr.cesr_data); -+#else - i = ces.ces_data[slot] & CESTATUS_FULL; -- - free(ces.ces_data); -+#endif -+ - return !i; - } - -@@ -146,16 +162,27 @@ - */ - int find_empty(int fd) - { -+#if defined(OCHIOGSTATUS) -+struct ochanger_element_status_request cesr; -+#else - struct changer_element_status ces; -+#endif -+ - int i,rc; - int type=CHET_ST; - - get_changer_info(fd); - -+#if defined(OCHIOGSTATUS) -+ cesr.cesr_type = type; -+ cesr.cesr_data = malloc(changer_info.cp_nslots); -+ rc = ioctl(fd, OCHIOGSTATUS, &cesr); -+#else - ces.ces_type = type; - ces.ces_data = malloc(changer_info.cp_nslots); -+ rc = ioctl(fd, CHIOGSTATUS, &ces); -+#endif - -- rc = ioctl(fd,CHIOGSTATUS,&ces); - if (rc) { - fprintf(stderr,"%s: changer status query failed: 0x%x %s\n", - get_pname(), rc, strerror(errno)); -@@ -163,9 +190,17 @@ - } - - i = 0; -+ -+#if defined(OCHIOGSTATUS) -+ while ((i < changer_info.cp_nslots)&&(cesr.cesr_data[i] & CESTATUS_FULL)) -+ i++; -+ free(cesr.cesr_data); -+#else - while ((i < changer_info.cp_nslots)&&(ces.ces_data[i] & CESTATUS_FULL)) - i++; - free(ces.ces_data); -+#endif -+ - return i; - } - -@@ -174,25 +209,41 @@ - */ - int drive_loaded(int fd, int drivenum) - { -+#if defined(OCHIOGSTATUS) -+struct ochanger_element_status_request cesr; -+#else - struct changer_element_status ces; -+#endif -+ - int i,rc; - int type=CHET_DT; - - get_changer_info(fd); - -+#if defined(OCHIOGSTATUS) -+ cesr.cesr_type = type; -+ cesr.cesr_data = malloc(changer_info.cp_ndrives); -+ rc = ioctl(fd, OCHIOGSTATUS, &cesr); -+#else - ces.ces_type = type; - ces.ces_data = malloc(changer_info.cp_ndrives); -- - rc = ioctl(fd, CHIOGSTATUS, &ces); -+#endif -+ - if (rc) { - fprintf(stderr,"%s: drive status query failed: 0x%x %s\n", - get_pname(), rc, strerror(errno)); - return -1; - } - -+#if defined(OCHIOGSTATUS) -+ i = (cesr.cesr_data[drivenum] & CESTATUS_FULL); -+ free(cesr.cesr_data); -+#else - i = (ces.ces_data[drivenum] & CESTATUS_FULL); -- - free(ces.ces_data); -+#endif -+ - return i; - } - -@@ -202,7 +253,12 @@ - */ - int unload(int fd, int drive, int slot) - { -+#if defined(OCHIOGSTATUS) -+struct changer_move_request move; -+#else - struct changer_move move; -+#endif -+ - int rc; - - move.cm_fromtype = CHET_DT; -@@ -226,7 +282,12 @@ - */ - int load(int fd, int drive, int slot) - { -+#if defined(OCHIOGSTATUS) -+struct changer_move_request move; -+#else - struct changer_move move; -+#endif -+ - int rc; - - move.cm_fromtype = CHET_ST; +$NetBSD: patch-ai,v 1.3 2001/01/16 21:59:40 cjones Exp $ + +--- restore-src/Makefile.in.orig Sat Nov 25 07:01:59 2000 ++++ restore-src/Makefile.in Mon Jan 15 14:54:31 2001 +@@ -156,8 +156,7 @@ + + libexec_PROGRAMS = amidxtaped + +-LDADD = ../tape-src/libamtape.$(LIB_EXTENSION) \ +- ../common-src/libamanda.$(LIB_EXTENSION) ++LDADD = -lamtape -lamanda + + + amidxtaped_SOURCES = amidxtaped.c +@@ -177,14 +176,12 @@ + am_amidxtaped_OBJECTS = amidxtaped.$(OBJEXT) + amidxtaped_OBJECTS = $(am_amidxtaped_OBJECTS) + amidxtaped_LDADD = $(LDADD) +-amidxtaped_DEPENDENCIES = ../tape-src/libamtape.$(LIB_EXTENSION) \ +-../common-src/libamanda.$(LIB_EXTENSION) ++amidxtaped_DEPENDENCIES = + amidxtaped_LDFLAGS = + amrestore_SOURCES = amrestore.c + amrestore_OBJECTS = amrestore.$(OBJEXT) + amrestore_LDADD = $(LDADD) +-amrestore_DEPENDENCIES = ../tape-src/libamtape.$(LIB_EXTENSION) \ +-../common-src/libamanda.$(LIB_EXTENSION) ++amrestore_DEPENDENCIES = + amrestore_LDFLAGS = + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |