main.c
author viric@llimona
Tue, 27 Mar 2007 23:29:56 +0200
changeset 58 3c492266923e
parent 55 678ca291d545
child 61 b8ca313cb00c
permissions -rw-r--r--
Preparing v0.2.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
49
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 48
diff changeset
     1
/*
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 48
diff changeset
     2
    Task Spooler - a task queue system for the unix user
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 48
diff changeset
     3
    Copyright (C) 2007  LluĂ­s Batlle i Rossell
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 48
diff changeset
     4
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 48
diff changeset
     5
    Please find the license in the provided COPYING file.
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 48
diff changeset
     6
*/
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
     7
#include <unistd.h>
11
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
     8
#include <assert.h>
44
4dcf05746ece Better include files.
viric@llimona
parents: 42
diff changeset
     9
#include <stdlib.h>
4dcf05746ece Better include files.
viric@llimona
parents: 42
diff changeset
    10
#include <string.h>
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    11
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    12
#include <stdio.h>
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    13
3
2fb8a6bdd024 More code.
viric@llimona
parents: 2
diff changeset
    14
#include "main.h"
2fb8a6bdd024 More code.
viric@llimona
parents: 2
diff changeset
    15
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    16
extern char *optarg;
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    17
extern int optind, opterr, optopt;
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    18
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
    19
/* Globals */
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
    20
struct Command_line command_line;
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    21
int server_socket;
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    22
18
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    23
/* Allocated in get_command() */
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    24
char *new_command;
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    25
58
3c492266923e Preparing v0.2.3
viric@llimona
parents: 55
diff changeset
    26
static char version[] = "Task Spooler v0.2.3 - a task queue system for the unix user.\n"
49
09bb8a5583e9 Added the license.
lbatlle@npdl268.bpo.hp.com
parents: 48
diff changeset
    27
"Copyright (C) 2007  Lluis Batlle i Rossell";
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
    28
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
    29
static void default_command_line()
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
    30
{
36
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
    31
    command_line.request = c_LIST;
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
    32
    command_line.need_server = 0;
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
    33
    command_line.store_output = 1;
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
    34
    command_line.should_go_background = 1;
55
678ca291d545 Now the '-nf' doesn't leave a job in 'finished' state.
viric@llimona
parents: 53
diff changeset
    35
    command_line.should_keep_finished = 1;
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
    36
}
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
    37
18
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    38
void get_command(int index, int argc, char **argv)
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    39
{
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    40
    int size;
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    41
    int i;
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    42
    
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    43
    size = 0;
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    44
    /* Count bytes needed */
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    45
    for (i = index; i < argc; ++i)
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    46
    {
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    47
        /* The '1' is for spaces, and at the last i,
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    48
         * for the null character */
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    49
        size = size + strlen(argv[i]) + 1;
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    50
    }
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    51
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    52
    /* Alloc */
40
ed74cc289130 Fixed a bug in getopt (:+ should be +:)
viric@llimona
parents: 38
diff changeset
    53
    new_command = (char *) malloc(size);
18
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    54
    assert(new_command != NULL);
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    55
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    56
    /* Build the command */
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    57
    strcpy(new_command, argv[index]);
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    58
    for (i = index+1; i < argc; ++i)
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    59
    {
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    60
        strcat(new_command, " ");
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    61
        strcat(new_command, argv[i]);
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    62
    }
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
    63
}
3
2fb8a6bdd024 More code.
viric@llimona
parents: 2
diff changeset
    64
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    65
void parse_opts(int argc, char **argv)
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    66
{
2
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
    67
    int c;
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    68
2
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
    69
    /* Parse options */
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
    70
    while(1) {
53
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
    71
        c = getopt(argc, argv, ":VhKClnfr:t:c:o:p:w:u:");
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    72
2
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
    73
        if (c == -1)
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
    74
            break;
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
    75
2
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
    76
        switch(c)
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
    77
        {
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
    78
            case 'K':
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
    79
                command_line.request = c_KILL_SERVER;
2
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
    80
                break;
3
2fb8a6bdd024 More code.
viric@llimona
parents: 2
diff changeset
    81
            case 'l':
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
    82
                command_line.request = c_LIST;
3
2fb8a6bdd024 More code.
viric@llimona
parents: 2
diff changeset
    83
                break;
36
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
    84
            case 'h':
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
    85
                command_line.request = c_SHOW_HELP;
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
    86
                break;
37
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
    87
            case 'V':
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
    88
                command_line.request = c_SHOW_VERSION;
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
    89
                break;
33
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
    90
            case 'C':
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
    91
                command_line.request = c_CLEAR_FINISHED;
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
    92
                break;
20
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 18
diff changeset
    93
            case 'c':
33
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
    94
                command_line.request = c_CAT;
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
    95
                command_line.jobid = atoi(optarg);
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
    96
                break;
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
    97
            case 'o':
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
    98
                command_line.request = c_SHOW_OUTPUT_FILE;
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
    99
                command_line.jobid = atoi(optarg);
20
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 18
diff changeset
   100
                break;
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 20
diff changeset
   101
            case 'n':
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   102
                command_line.store_output = 0;
22
afdc8410633f Now output can go to filenames.
viric@llimona
parents: 20
diff changeset
   103
                break;
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   104
            case 'f':
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   105
                command_line.should_go_background = 0;
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   106
                break;
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   107
            case 't':
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   108
                command_line.request = c_TAIL;
32
3531439f2770 Tail works.
viric@llimona
parents: 31
diff changeset
   109
                command_line.jobid = atoi(optarg);
29
ca47653a4cbc Add an option for electing not to go into background.
viric@llimona
parents: 27
diff changeset
   110
                break;
35
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 33
diff changeset
   111
            case 'p':
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 33
diff changeset
   112
                command_line.request = c_SHOW_PID;
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 33
diff changeset
   113
                command_line.jobid = atoi(optarg);
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 33
diff changeset
   114
                break;
41
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   115
            case 'r':
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   116
                command_line.request = c_REMOVEJOB;
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   117
                command_line.jobid = atoi(optarg);
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   118
                break;
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   119
            case 'w':
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   120
                command_line.request = c_WAITJOB;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   121
                command_line.jobid = atoi(optarg);
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   122
                break;
53
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   123
            case 'u':
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   124
                command_line.request = c_URGENT;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   125
                command_line.jobid = atoi(optarg);
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   126
                break;
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   127
            case ':':
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   128
                switch(optopt)
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   129
                {
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   130
                    case 't':
32
3531439f2770 Tail works.
viric@llimona
parents: 31
diff changeset
   131
                        command_line.request = c_TAIL;
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   132
                        command_line.jobid = -1; /* This means the 'last' job */
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   133
                        break;
33
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   134
                    case 'c':
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   135
                        command_line.request = c_CAT;
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   136
                        command_line.jobid = -1; /* This means the 'last' job */
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   137
                        break;
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   138
                    case 'o':
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   139
                        command_line.request = c_SHOW_OUTPUT_FILE;
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   140
                        command_line.jobid = -1; /* This means the 'last' job */
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   141
                        break;
35
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 33
diff changeset
   142
                    case 'p':
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 33
diff changeset
   143
                        command_line.request = c_SHOW_PID;
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 33
diff changeset
   144
                        command_line.jobid = -1; /* This means the 'last' job */
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 33
diff changeset
   145
                        break;
41
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   146
                    case 'r':
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   147
                        command_line.request = c_REMOVEJOB;
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   148
                        command_line.jobid = -1; /* This means the 'last'
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   149
                                                    added job */
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   150
                        break;
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   151
                    case 'w':
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   152
                        command_line.request = c_WAITJOB;
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   153
                        command_line.jobid = -1; /* This means the 'last'
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   154
                                                    added job */
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   155
                        break;
53
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   156
                    case 'u':
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   157
                        command_line.request = c_URGENT;
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   158
                        command_line.jobid = -1; /* This means the 'last'
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   159
                                                    added job */
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   160
                        break;
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   161
                    default:
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   162
                        fprintf(stderr, "Option %c missing argument: %s\n",
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   163
                                optopt, optarg);
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   164
                        exit(-1);
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   165
                }
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   166
                break;
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   167
            case '?':
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   168
                fprintf(stderr, "Wrong option %c.\n", optopt);
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   169
                exit(-1);
2
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
   170
        }
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
   171
    }
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
   172
18
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
   173
    new_command = 0;
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
   174
37
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   175
    /* if the request is still the default option... 
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   176
     * (the default values should be centralized) */
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   177
    if (optind < argc && command_line.request == c_LIST)
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   178
    {
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   179
        command_line.request = c_QUEUE;
18
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
   180
        get_command(optind, argc, argv);
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   181
    }
3
2fb8a6bdd024 More code.
viric@llimona
parents: 2
diff changeset
   182
37
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   183
    if (command_line.request != c_SHOW_HELP &&
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   184
            command_line.request != c_SHOW_VERSION)
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   185
        command_line.need_server = 1;
55
678ca291d545 Now the '-nf' doesn't leave a job in 'finished' state.
viric@llimona
parents: 53
diff changeset
   186
678ca291d545 Now the '-nf' doesn't leave a job in 'finished' state.
viric@llimona
parents: 53
diff changeset
   187
    if ( ! command_line.store_output && ! command_line.should_go_background )
678ca291d545 Now the '-nf' doesn't leave a job in 'finished' state.
viric@llimona
parents: 53
diff changeset
   188
        command_line.should_keep_finished = 0;
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
   189
}
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
   190
44
4dcf05746ece Better include files.
viric@llimona
parents: 42
diff changeset
   191
static void go_background()
11
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   192
{
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   193
    int pid;
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   194
    pid = fork();
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   195
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   196
    switch(pid)
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   197
    {
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   198
        case -1:
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   199
            perror("fork failed");
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   200
            exit(-1);
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   201
            break;
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   202
        case 0:
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   203
            break;
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   204
        default:
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   205
            exit(0);
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   206
    }
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   207
}
bb94b9890001 Going to background at for new command queued.
lbatlle@npdl268.bpo.hp.com
parents: 8
diff changeset
   208
37
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   209
static void print_help(const char *cmd)
36
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   210
{
52
7c6dc23a2a32 Better 'help'.
viric@llimona
parents: 51
diff changeset
   211
    printf("usage: %s [action] [-n] [-f] [cmd...]\n", cmd);
7c6dc23a2a32 Better 'help'.
viric@llimona
parents: 51
diff changeset
   212
    printf("Actions:\n");
36
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   213
    printf("  -K       kill the task spooler server\n");
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   214
    printf("  -C       clear the list of finished jobs\n");
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   215
    printf("  -l       show the job list (default action)\n");
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   216
    printf("  -t [id]  tail -f the output of the job. Last if not specified.\n");
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   217
    printf("  -c [id]  cat the output of the job. Last if not specified.\n");
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   218
    printf("  -p [id]  show the pid of the job. Last if not specified.\n");
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   219
    printf("  -r [id]  remove a job. The last added, if not specified.\n");
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   220
    printf("  -w [id]  wait for a job. The last added, if not specified.\n");
53
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   221
    printf("  -u [id]  put that job first. The last added, if not specified.\n");
37
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   222
    printf("  -h       show this help\n");
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   223
    printf("  -V       show the program version\n");
52
7c6dc23a2a32 Better 'help'.
viric@llimona
parents: 51
diff changeset
   224
    printf("Options adding jobs:\n");
36
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   225
    printf("  -n       don't store the output of the command.\n");
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   226
    printf("  -f       don't fork into background.\n");
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   227
}
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   228
37
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   229
static void print_version()
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   230
{
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   231
    puts(version);
44
4dcf05746ece Better include files.
viric@llimona
parents: 42
diff changeset
   232
}
37
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   233
48
630e26b09141 A bit better compilation in GNU systems.
viric@llimona
parents: 46
diff changeset
   234
static void set_my_env()
630e26b09141 A bit better compilation in GNU systems.
viric@llimona
parents: 46
diff changeset
   235
{
58
3c492266923e Preparing v0.2.3
viric@llimona
parents: 55
diff changeset
   236
    static char tmp[] = "POSIXLY_CORRECT=YES";
48
630e26b09141 A bit better compilation in GNU systems.
viric@llimona
parents: 46
diff changeset
   237
    putenv(tmp);
630e26b09141 A bit better compilation in GNU systems.
viric@llimona
parents: 46
diff changeset
   238
}
630e26b09141 A bit better compilation in GNU systems.
viric@llimona
parents: 46
diff changeset
   239
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
   240
int main(int argc, char **argv)
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
   241
{
38
768d009604b3 The program returns the errorlevel of the job, if it doesn't go to background.
viric@llimona
parents: 37
diff changeset
   242
    int errorlevel = 0;
41
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   243
48
630e26b09141 A bit better compilation in GNU systems.
viric@llimona
parents: 46
diff changeset
   244
    set_my_env();
41
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   245
    /* This is needed in a gnu system, so getopt works well */
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   246
    default_command_line();
2
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
   247
    parse_opts(argc, argv);
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
   248
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   249
    if (command_line.need_server)
3
2fb8a6bdd024 More code.
viric@llimona
parents: 2
diff changeset
   250
        ensure_server_up();
2fb8a6bdd024 More code.
viric@llimona
parents: 2
diff changeset
   251
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   252
    switch(command_line.request)
3
2fb8a6bdd024 More code.
viric@llimona
parents: 2
diff changeset
   253
    {
37
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   254
    case c_SHOW_VERSION:
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   255
        print_version(argv[0]);
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   256
        break;
36
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   257
    case c_SHOW_HELP:
f3b164620a3a Added help.
viric@llimona
parents: 35
diff changeset
   258
        print_help(argv[0]);
37
f2f6c6f0e86f Added version.
viric@llimona
parents: 36
diff changeset
   259
        break;
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   260
    case c_QUEUE:
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   261
        assert(new_command != 0);
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   262
        if (command_line.should_go_background)
29
ca47653a4cbc Add an option for electing not to go into background.
viric@llimona
parents: 27
diff changeset
   263
            go_background();
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   264
        assert(command_line.need_server);
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   265
        c_new_job(new_command);
38
768d009604b3 The program returns the errorlevel of the job, if it doesn't go to background.
viric@llimona
parents: 37
diff changeset
   266
        if (!command_line.should_go_background)
768d009604b3 The program returns the errorlevel of the job, if it doesn't go to background.
viric@llimona
parents: 37
diff changeset
   267
            errorlevel = c_wait_server_commands(new_command);
768d009604b3 The program returns the errorlevel of the job, if it doesn't go to background.
viric@llimona
parents: 37
diff changeset
   268
        else
768d009604b3 The program returns the errorlevel of the job, if it doesn't go to background.
viric@llimona
parents: 37
diff changeset
   269
            c_wait_server_commands(new_command);
18
af4898956964 Now commands of any-length are accepted.
viric@llimona
parents: 16
diff changeset
   270
        free(new_command);
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   271
        break;
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   272
    case c_LIST:
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   273
        assert(command_line.need_server);
8
03339adb7014 Some more code for execution.
viric@llimona
parents: 5
diff changeset
   274
        c_list_jobs();
5
bc5e251418f3 The LIST_LINEs are outputed by the client.
viric@llimona
parents: 3
diff changeset
   275
        c_wait_server_lines();
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   276
        break;
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   277
    case c_KILL_SERVER:
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   278
        assert(command_line.need_server);
3
2fb8a6bdd024 More code.
viric@llimona
parents: 2
diff changeset
   279
        c_shutdown_server();
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   280
        break;
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   281
    case c_CLEAR_FINISHED:
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   282
        assert(command_line.need_server);
20
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 18
diff changeset
   283
        c_clear_finished();
31
1a6c732b0b71 The command line parsing has been simplified.
viric@llimona
parents: 30
diff changeset
   284
        break;
32
3531439f2770 Tail works.
viric@llimona
parents: 31
diff changeset
   285
    case c_TAIL:
3531439f2770 Tail works.
viric@llimona
parents: 31
diff changeset
   286
        assert(command_line.need_server);
3531439f2770 Tail works.
viric@llimona
parents: 31
diff changeset
   287
        c_tail();
3531439f2770 Tail works.
viric@llimona
parents: 31
diff changeset
   288
        /* This will not return! */
3531439f2770 Tail works.
viric@llimona
parents: 31
diff changeset
   289
        break;
33
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   290
    case c_CAT:
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   291
        assert(command_line.need_server);
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   292
        c_cat();
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   293
        /* This will not return! */
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   294
        break;
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   295
    case c_SHOW_OUTPUT_FILE:
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   296
        assert(command_line.need_server);
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   297
        c_show_output_file();
5c2d981f2f8e Added 'cat' and 'show output filename'
viric@llimona
parents: 32
diff changeset
   298
        break;
35
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 33
diff changeset
   299
    case c_SHOW_PID:
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 33
diff changeset
   300
        assert(command_line.need_server);
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 33
diff changeset
   301
        c_show_pid();
83d0da612dc4 Kill the running job works fine.
viric@llimona
parents: 33
diff changeset
   302
        break;
41
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   303
    case c_REMOVEJOB:
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   304
        assert(command_line.need_server);
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   305
        c_remove_job();
cad41574feda Added 'remove job'.
viric@llimona
parents: 40
diff changeset
   306
        break;
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   307
    case c_WAITJOB:
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   308
        assert(command_line.need_server);
51
aa6e05d77537 '-w' returns the waited errorlevel. Added a testbench.
viric@llimona
parents: 49
diff changeset
   309
        errorlevel = c_wait_job();
42
f093d0964cf5 Added wait for jobs.
viric@llimona
parents: 41
diff changeset
   310
        break;
53
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   311
    case c_URGENT:
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   312
        assert(command_line.need_server);
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   313
        c_move_urgent();
731c41817842 '-u' (urgency) implemented.
viric@llimona
parents: 52
diff changeset
   314
        break;
20
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 18
diff changeset
   315
    }
d85b4c0745fa "-c" added, for clearing the finished tasks' list.
viric@llimona
parents: 18
diff changeset
   316
30
ab88478a7e9b The commandline parameters are centered in a struct.
viric@llimona
parents: 29
diff changeset
   317
    if (command_line.need_server)
2
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
   318
    {
3
2fb8a6bdd024 More code.
viric@llimona
parents: 2
diff changeset
   319
        close(server_socket);
2
602bd67df3aa Changed tabs to 4 spaces. Rule.
viric@llimona
parents: 1
diff changeset
   320
    }
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
   321
38
768d009604b3 The program returns the errorlevel of the job, if it doesn't go to background.
viric@llimona
parents: 37
diff changeset
   322
    return errorlevel;
1
74928e2b27f4 Honta versio de ia strukturo.
viric@llimona
parents:
diff changeset
   323
}