- merge patch from Michael Riepe (specify device to use).

- fix some minor compiler warnings.

1 files changed, 12 insertions, 8 deletions

diff --git a/mover.c b/mover.c
index 8866abe..ab8a1a0 100644
--- a/mover.c
+++ b/mover.c
@@ -15,7 +15,7 @@
 struct changer_params         params;
 struct changer_vendor_params  vparams;
 
-int
+static int
 parse_arg(char *arg, int *type, int *nr)
 {
     char t;
@@ -116,10 +116,14 @@ print_stat(int fd, int type, int count)
 int
 main(int argc, char *argv[])
 {
+    char *changer;
     int    fd,rc;
 
-    if (-1 == (fd = open(CHANGER,O_RDONLY))) {
-	perror("open");
+    if (!(changer = getenv("CHANGER"))) {
+	changer = CHANGER;
+    }
+    if (-1 == (fd = open(changer,O_RDONLY))) {
+	fprintf(stderr,"open %s: %s\n",changer,strerror(errno));
 	exit(1);
     }
     
@@ -128,7 +132,7 @@ main(int argc, char *argv[])
 	fprintf(stderr,"ioctl failed (GPARAMS): %s\n",strerror(errno));
 	exit(1);
     } else {
-	printf(CHANGER ": mt=%i st=%i ie=%i dt=%i\n",
+	printf("%s: mt=%i st=%i ie=%i dt=%i\n", changer,
 	       params.cp_npickers,params.cp_nslots,
 	       params.cp_nportals,params.cp_ndrives);
     }
@@ -137,13 +141,13 @@ main(int argc, char *argv[])
 	fprintf(stderr,"ioctl failed (VPARAMS): %s\n",strerror(errno));
     } else {
 	if (vparams.cvp_n1)
-	    printf(CHANGER ": v1=%d [%s]\n",vparams.cvp_n1,vparams.cvp_label1);
+	    printf("%s: v1=%d [%s]\n",changer,vparams.cvp_n1,vparams.cvp_label1);
 	if (vparams.cvp_n2)
-	    printf(CHANGER ": v2=%d [%s]\n",vparams.cvp_n2,vparams.cvp_label2);
+	    printf("%s: v2=%d [%s]\n",changer,vparams.cvp_n2,vparams.cvp_label2);
 	if (vparams.cvp_n3)
-	    printf(CHANGER ": v3=%d [%s]\n",vparams.cvp_n3,vparams.cvp_label3);
+	    printf("%s: v3=%d [%s]\n",changer,vparams.cvp_n3,vparams.cvp_label3);
 	if (vparams.cvp_n4)
-	    printf(CHANGER ": v4=%d [%s]\n",vparams.cvp_n4,vparams.cvp_label4);
+	    printf("%s: v4=%d [%s]\n",changer,vparams.cvp_n4,vparams.cvp_label4);
     }
 
     if (argc == 1 || 0 == strcasecmp(argv[1],"status")) {