projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.3.3
[debian/amanda]
/
server-src
/
tapefile.c
diff --git
a/server-src/tapefile.c
b/server-src/tapefile.c
index faf58759bb510625a11337a4c8751b035cda8552..35cbef231c1619a5c7e8f90f6bba25650ec61ef1 100644
(file)
--- a/
server-src/tapefile.c
+++ b/
server-src/tapefile.c
@@
-1,6
+1,7
@@
/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
* Copyright (c) 1991-1998 University of Maryland at College Park
/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
* Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc. All Rights Reserved.
* All Rights Reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* All Rights Reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@
-366,6
+367,7
@@
parse_tapeline(
tape_t *tp = NULL;
char *s, *s1;
int ch;
tape_t *tp = NULL;
char *s, *s1;
int ch;
+ char *cline;
*status = 0;
*status = 0;
@@
-377,6
+379,7
@@
parse_tapeline(
return NULL;
}
return NULL;
}
+ cline = g_strdup(line);
tp = g_new0(tape_t, 1);
s1 = s - 1;
tp = g_new0(tape_t, 1);
s1 = s - 1;
@@
-432,6
+435,8
@@
parse_tapeline(
}
if (*(s - 1) == '#') {
tp->comment = stralloc(s); /* skip leading '#' */
}
if (*(s - 1) == '#') {
tp->comment = stralloc(s); /* skip leading '#' */
+ } else if (*(s-1)) {
+ g_critical("Bogus line in the tapelist file: %s", cline);
}
return tp;
}
return tp;