if(get_info(dp->host->hostname, dp->name, &info)) {
/* no record for this disk, make a note of it */
- log_add(L_INFO, _("Adding new disk %s:%s."), dp->host->hostname, dp->name);
+ log_add(L_INFO, _("Adding new disk %s:%s."), dp->host->hostname, qname);
}
/* setup working data struct for disk */
if(strncmp_const(line, "OPTIONS ") == 0) {
t = strstr(line, "features=");
if(t != NULL && (g_ascii_isspace((int)t[-1]) || t[-1] == ';')) {
+ char *u = strchr(t, ';');
+ if (u)
+ *u = '\0';
t += SIZEOF("features=")-1;
am_release_feature_set(hostp->features);
if((hostp->features = am_string_to_feature(t)) == NULL) {
_(": bad features value: %s\n"), line);
goto error_return;
}
+ if (u)
+ *u = ';';
}
skip_quoted_line(s, ch);
continue;
skip_quoted_line(s, ch);
continue;
}
- t = index(t,'\n');
+ t = strchr(t,'\n');
if (t) /* truncate after the first line */
*t = '\0';
errbuf = vstralloc(hostp->hostname,