Kristyna Streitova
658a744b4d
- Drop patch at-3.1.8-eal3-manpages.patch merged upstream differently - Version update to at 3.1.20 to match latest upstream: * Pam and selinux implemented upstream * various tiny fixes - Rebase patches: * at-3.1.13-documentation-dir.patch * at-3.1.13-massive_batch.patch * at-3.1.14-joblist.patch * at-3.1.14-parse-suse-sysconfig.patch * at-3.1.14-usePOSIXtimers.patch * at-3.1.14.patch - Drop no longer needed patches: * at-3.1.13-formatbugs.patch * at-3.1.13-pam-session-as-root.patch * at-3.1.13-pam.patch * at-3.1.13-queue-nice-level.patch * at-3.1.14-selinux.patch OBS-URL: https://build.opensuse.org/request/show/512270 OBS-URL: https://build.opensuse.org/package/show/Base:System/at?expand=0&rev=102
112 lines
2.8 KiB
Diff
112 lines
2.8 KiB
Diff
Index: at.c
|
|
===================================================================
|
|
--- at.c.orig
|
|
+++ at.c
|
|
@@ -134,7 +134,9 @@ static void sigc(int signo);
|
|
static void alarmc(int signo);
|
|
static char *cwdname(void);
|
|
static void writefile(time_t runtimer, char queue);
|
|
-static void list_jobs(void);
|
|
+static void list_jobs(long *, int);
|
|
+static int in_job_list(long, long *, int);
|
|
+static long *get_job_list(int, char *[], int *);
|
|
|
|
/* Signal catching functions */
|
|
|
|
@@ -566,8 +568,20 @@ writefile(time_t runtimer, char queue)
|
|
return;
|
|
}
|
|
|
|
+static int
|
|
+in_job_list(long job, long *joblist, int len)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < len; i++)
|
|
+ if (job == joblist[i])
|
|
+ return 1;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static void
|
|
-list_jobs(void)
|
|
+list_jobs(long *joblist, int len)
|
|
{
|
|
/* List all a user's jobs in the queue, by looping through ATJOB_DIR,
|
|
* or everybody's if we are root
|
|
@@ -606,6 +620,10 @@ list_jobs(void)
|
|
if (sscanf(dirent->d_name, "%c%5lx%8lx", &queue, &jobno, &ctm) != 3)
|
|
continue;
|
|
|
|
+ /* If jobs are given, only list those jobs */
|
|
+ if (joblist && !in_job_list(jobno, joblist, len))
|
|
+ continue;
|
|
+
|
|
if (atqueue && (queue != atqueue))
|
|
continue;
|
|
|
|
@@ -727,6 +745,29 @@ process_jobs(int argc, char **argv, int
|
|
return rc;
|
|
} /* delete_jobs */
|
|
|
|
+static long *
|
|
+get_job_list(int argc, char *argv[], int *joblen)
|
|
+{
|
|
+ int i, len;
|
|
+ long *joblist;
|
|
+ char *ep;
|
|
+
|
|
+ joblist = NULL;
|
|
+ len = argc;
|
|
+ if (len > 0) {
|
|
+ joblist = (long *) mymalloc(len * sizeof(*joblist));
|
|
+ for (i = 0; i < argc; i++) {
|
|
+ errno = 0;
|
|
+ if ((joblist[i] = strtol(argv[i], &ep, 10)) < 0 ||
|
|
+ ep == argv[i] || *ep != '\0' || errno)
|
|
+ panic("invalid job number");
|
|
+ }
|
|
+ }
|
|
+
|
|
+ *joblen = len;
|
|
+ return joblist;
|
|
+}
|
|
+
|
|
/* Global functions */
|
|
|
|
void *
|
|
@@ -752,6 +793,8 @@ main(int argc, char **argv)
|
|
char *options = "q:f:MmbvlrdhVct:"; /* default options for at */
|
|
int disp_version = 0;
|
|
time_t timer = 0;
|
|
+ long *joblist = NULL;
|
|
+ int joblen = 0;
|
|
struct passwd *pwe;
|
|
struct group *ge;
|
|
|
|
@@ -889,8 +932,9 @@ main(int argc, char **argv)
|
|
case ATQ:
|
|
|
|
REDUCE_PRIV(daemon_uid, daemon_gid)
|
|
-
|
|
- list_jobs();
|
|
+ if (queue_set == 0)
|
|
+ joblist = get_job_list(argc - optind, argv + optind, &joblen);
|
|
+ list_jobs(joblist, joblen);
|
|
break;
|
|
|
|
case ATRM:
|
|
Index: panic.c
|
|
===================================================================
|
|
--- panic.c.orig
|
|
+++ panic.c
|
|
@@ -95,6 +95,7 @@ usage(void)
|
|
fprintf(stderr, "Usage: at [-V] [-q x] [-f file] [-mMlbv] timespec ...\n"
|
|
" at [-V] [-q x] [-f file] [-mMlbv] -t time\n"
|
|
" at -c job ...\n"
|
|
+ " at [-V] -l [job ...]\n"
|
|
" atq [-V] [-q x]\n"
|
|
" at [ -rd ] job ...\n"
|
|
" atrm [-V] job ...\n"
|