- if (strchr(ua->argv[i], ',') != NULL || strchr(ua->argv[i], '-') != NULL) {
- s = bstrdup(ua->argv[i]);
- tok = s;
- /*
- * We could use strtok() here. But we're not going to, because:
- * (a) strtok() is deprecated, having been replaced by strsep();
- * (b) strtok() is broken in significant ways.
- * we could use strsep() instead, but it's not universally available.
- * so we grow our own using strchr().
- */
- sep = strchr(tok, ',');
- while (sep != NULL) {
- *sep = '\0';
- if (!delete_job_id_range(ua, tok)) {
- JobId = str_to_int64(tok);
- do_job_delete(ua, JobId);
- }
- tok = ++sep;
- sep = strchr(tok, ',');
- }
- /* pick up the last token */
- if (!delete_job_id_range(ua, tok)) {
- JobId = str_to_int64(tok);
- do_job_delete(ua, JobId);
- }
+ if (strchr(ua->argv[i], ',') || strchr(ua->argv[i], '-')) {
+ s = bstrdup(ua->argv[i]);
+ tok = s;
+
+ /*
+ * We could use strtok() here. But we're not going to, because:
+ * (a) strtok() is deprecated, having been replaced by strsep();
+ * (b) strtok() is broken in significant ways.
+ * we could use strsep() instead, but it's not universally available.
+ * so we grow our own using strchr().
+ */
+ sep = strchr(tok, ',');
+ while (sep != NULL) {
+ *sep = '\0';
+ if (!delete_job_id_range(ua, tok)) {
+ if (is_a_number(tok)) {
+ JobId = (JobId_t)str_to_uint64(tok);
+ do_job_delete(ua, JobId);
+ } else {
+ ua->warning_msg(_("Illegal JobId %s ignored\n"), tok);
+ }
+ }
+ tok = ++sep;
+ sep = strchr(tok, ',');
+ }
+
+ /*
+ * Pick up the last token
+ */
+ if (!delete_job_id_range(ua, tok)) {
+ if (is_a_number(tok)) {
+ JobId = (JobId_t)str_to_uint64(tok);
+ do_job_delete(ua, JobId);
+ } else {
+ ua->warning_msg(_("Illegal JobId %s ignored\n"), tok);
+ }
+ }