* file named AUTHORS, in the root directory of this distribution.
*/
/*
- * $Id: changer.c,v 1.29.2.1 2006/04/24 14:43:01 martinea Exp $
+ * $Id: changer.c,v 1.36 2006/08/24 01:57:16 paddy_s Exp $
*
* interface routines for tape changers
*/
static char *tapechanger = NULL;
/* local functions */
-static int changer_command P((char *cmd, char *arg));
+static int changer_command(char *cmd, char *arg);
+static int report_bad_resultstr(void);
+static int run_changer_command(char *cmd, char *arg, char **slotstr, char **rest);
-int changer_init()
+int
+changer_init(void)
{
tapechanger = getconf_str(CNF_TPCHANGER);
return strcmp(tapechanger, "") != 0;
}
-static int report_bad_resultstr()
+static int
+report_bad_resultstr(void)
{
char *s;
return 2;
}
-static int run_changer_command(cmd, arg, slotstr, rest)
-char *cmd;
-char *arg;
-char **slotstr;
-char **rest;
+static int
+run_changer_command(
+ char * cmd,
+ char * arg,
+ char ** slotstr,
+ char ** rest)
{
int exitcode;
char *result_copy;
int ch;
if (slotstr) {
- *slotstr = NULL;
+ *slotstr = NULL;
}
if (rest) {
- *rest = NULL;
+ *rest = NULL;
}
exitcode = changer_command(cmd, arg);
s = changer_resultstr;
skip_non_whitespace(s, ch);
s[-1] = '\0';
if (slotstr) {
- *slotstr = newstralloc(*slotstr, slot);
+ *slotstr = newstralloc(*slotstr, slot);
}
- s[-1] = ch;
+ s[-1] = (char)ch;
skip_whitespace(s, ch);
- if(rest) {
- *rest = s - 1;
+ if (rest) {
+ *rest = s - 1;
}
if(exitcode) {
return 0;
}
-int changer_reset(slotstr)
-char **slotstr;
+int
+changer_reset(
+ char ** slotstr)
{
char *rest;
return run_changer_command("-reset", (char *) NULL, slotstr, &rest);
}
-int changer_clean(slotstr)
-char **slotstr;
+int
+changer_clean(
+ char ** slotstr)
{
char *rest;
return run_changer_command("-clean", (char *) NULL, slotstr, &rest);
}
-int changer_eject(slotstr)
-char **slotstr;
+int
+changer_eject(
+ char ** slotstr)
{
char *rest;
return run_changer_command("-eject", (char *) NULL, slotstr, &rest);
}
-int changer_loadslot(inslotstr, outslotstr, devicename)
-char *inslotstr, **outslotstr, **devicename;
+int
+changer_loadslot(
+ char *inslotstr,
+ char **outslotstr,
+ char **devicename)
{
char *rest;
int rc;
return 0;
}
-/* This function is somewhat equal to changer_info with one additional
- parameter, to get information, if the changer is able to search for
- tapelabels himself. E.g. Barcodereader
- The changer_script answers with an additional parameter, if it is able
- to search. This one should be 1, if it is able to search, and 0 if it
- knows about the extension. If the additional answer is omitted, the
- changer is not able to search for a tape.
-*/
-int changer_query(nslotsp, curslotstr, backwardsp, searchable)
-int *nslotsp, *backwardsp, *searchable;
-char **curslotstr;
+
+/*
+ * This function is somewhat equal to changer_info with one additional
+ * parameter, to get information, if the changer is able to search for
+ * tapelabels himself. E.g. Barcodereader
+ * The changer_script answers with an additional parameter, if it is able
+ * to search. This one should be 1, if it is able to search, and 0 if it
+ * knows about the extension. If the additional answer is omitted, the
+ * changer is not able to search for a tape.
+ */
+
+int
+changer_query(
+ int * nslotsp,
+ char ** curslotstr,
+ int * backwardsp,
+ int * searchable)
{
char *rest;
int rc;
return 0;
}
-int changer_info(nslotsp, curslotstr, backwardsp)
-int *nslotsp, *backwardsp;
-char **curslotstr;
+int
+changer_info(
+ int * nslotsp,
+ char ** curslotstr,
+ int * backwardsp)
{
char *rest;
int rc;
/* ---------------------------- */
-/* This function first uses searchlabel and changer_search, if
- the library is able to find a tape itself. If it is not, or if
- the tape could not be found, then the normal scan is done.
-
- See interface documentation in changer.h.
-*/
-void changer_find(user_data, user_init, user_slot, searchlabel)
- void *user_data;
- int (*user_init) P((void *user_data, int rc, int nslots, int backwards,
- int searchable));
- int (*user_slot) P((void *user_data, int rc, char *slotstr,
- char *device));
- char *searchlabel;
+/*
+ * This function first uses searchlabel and changer_search, if
+ * the library is able to find a tape itself. If it is not, or if
+ * the tape could not be found, then the normal scan is done.
+ *
+ * See interface documentation in changer.h.
+ */
+
+void
+changer_find(
+ void * user_data,
+ int (*user_init)(void *, int, int, int, int),
+ int (*user_slot)(void *, int, char *, char *),
+ char * searchlabel)
{
char *slotstr, *device = NULL, *curslotstr = NULL;
int nslots, checked, backwards, rc, done, searchable;
rc = changer_query(&nslots, &curslotstr, &backwards, &searchable);
+
+ if (rc != 0) {
+ /* Problem with the changer script. Bail. */
+ fprintf(stderr, "Changer problem: %s\n", changer_resultstr);
+ return;
+ }
+
done = user_init(user_data, rc, nslots, backwards, searchable);
amfree(curslotstr);
}
if ((searchlabel!=NULL) && searchable && !done){
- rc=changer_search(searchlabel,&curslotstr,&device);
+ rc=changer_search(searchlabel, &curslotstr, &device);
if(rc == 0)
- done = user_slot(user_data, rc,curslotstr,device);
+ done = user_slot(user_data, rc, curslotstr, device);
}
slotstr = "current";
/* ---------------------------- */
-void changer_current(user_data, user_init, user_slot)
- void *user_data;
-int (*user_init) P((void *ud, int rc, int nslots, int backwards, int searchable));
-int (*user_slot) P((void *ud, int rc, char *slotstr, char *device));
+void
+changer_current(
+ void * user_data,
+ int (*user_init)(void *, int, int, int, int),
+ int (*user_slot)(void *, int, char *, char *))
{
char *device = NULL, *curslotstr = NULL;
int nslots, backwards, rc, done, searchable;
/* ---------------------------- */
-static int changer_command(cmd, arg)
- char *cmd;
- char *arg;
+static int
+changer_command(
+ char *cmd,
+ char *arg)
{
int fd[2];
- amwait_t wait_exitcode;
+ amwait_t wait_exitcode = 1;
int exitcode;
char num1[NUM_STR_SIZE];
char num2[NUM_STR_SIZE];
exitcode = 2;
goto failed;
}
- if(fd[0] < 0 || fd[0] >= FD_SETSIZE) {
- snprintf(num1, sizeof(num1), "%d", fd[0]);
- snprintf(num2, sizeof(num2), "%d", FD_SETSIZE-1);
+
+ /* make sure fd[0] != 1 */
+ if(fd[0] == 1) {
+ int a = dup(fd[0]);
+ close(fd[0]);
+ fd[0] = a;
+ }
+
+ if(fd[0] < 0 || fd[0] >= (int)FD_SETSIZE) {
+ snprintf(num1, SIZEOF(num1), "%d", fd[0]);
+ snprintf(num2, SIZEOF(num2), "%d", FD_SETSIZE-1);
changer_resultstr = vstralloc ("<error> ",
"could not create pipe for \"",
cmdstr,
exitcode = 2;
goto done;
}
- if(fd[1] < 0 || fd[1] >= FD_SETSIZE) {
- snprintf(num1, sizeof(num1), "%d", fd[1]);
- snprintf(num2, sizeof(num2), "%d", FD_SETSIZE-1);
+ if(fd[1] < 0 || fd[1] >= (int)FD_SETSIZE) {
+ snprintf(num1, SIZEOF(num1), "%d", fd[1]);
+ snprintf(num2, SIZEOF(num2), "%d", FD_SETSIZE-1);
changer_resultstr = vstralloc ("<error> ",
"could not create pipe for \"",
cmdstr,
exit(1);
}
if(arg) {
- execle(tapechanger, tapechanger, cmd, arg, NULL, safe_env());
+ execle(tapechanger, tapechanger, cmd, arg, (char *)NULL,
+ safe_env());
} else {
- execle(tapechanger, tapechanger, cmd, NULL, safe_env());
+ execle(tapechanger, tapechanger, cmd, (char *)NULL, safe_env());
}
changer_resultstr = vstralloc ("<error> ",
"could not exec \"",
goto done;
}
} else if (pid != changer_pid) {
- snprintf(num1, sizeof(num1), "%ld", (long)pid);
+ snprintf(num1, SIZEOF(num1), "%ld", (long)pid);
changer_resultstr = vstralloc ("<error> ",
"wait for \"",
tapechanger,
/* mark out-of-control changers as fatal error */
if(WIFSIGNALED(wait_exitcode)) {
- snprintf(num1, sizeof(num1), "%d", WTERMSIG(wait_exitcode));
+ snprintf(num1, SIZEOF(num1), "%d", WTERMSIG(wait_exitcode));
changer_resultstr = newvstralloc (changer_resultstr,
"<error> ",
changer_resultstr,
aclose(fd[1]);
failed:
- dbprintf(("changer: got exit: %d str: %s\n", exitcode, changer_resultstr));
+ if (exitcode != 0) {
+ dbprintf(("changer: got exit: %d str: %s\n", exitcode, changer_resultstr));
+ }
amfree(cmdstr);
return exitcode;
}
-/* This function commands the changerscript to look for a tape named
- searchlabel. If is found, the changerscript answers with the device,
- in which the tape can be accessed.
-*/
-int changer_search(searchlabel, outslotstr, devicename)
-char *searchlabel, **outslotstr, **devicename;
+
+/*
+ * This function commands the changerscript to look for a tape named
+ * searchlabel. If is found, the changerscript answers with the device,
+ * in which the tape can be accessed.
+ */
+
+int
+changer_search(
+ char * searchlabel,
+ char ** outslotstr,
+ char ** devicename)
{
char *rest;
int rc;
return 0;
}
-/* Because barcodelabel are short, and may not be the same as the
- amandalabels, the changerscript should be informed, which tapelabel
- is associated with a tape. This function should be called after
- giving a label for a tape. (Maybe also, when the label and the associated
- slot is known. e.g. during library scan.
-*/
-int changer_label (slotsp,labelstr)
-char *slotsp;
-char *labelstr;
+
+/*
+ * Because barcodelabel are short, and may not be the same as the
+ * amandalabels, the changerscript should be informed, which tapelabel
+ * is associated with a tape. This function should be called after
+ * giving a label for a tape. (Maybe also, when the label and the associated
+ * slot is known. e.g. during library scan.
+ */
+
+int
+changer_label(
+ char * slotsp,
+ char * labelstr)
{
int rc;
char *rest=NULL;
projects / debian / amanda / blobdiff