int recursion = 0, interactive;
extern int errno;
extern int sending_version_no;
-int count, quit=0, cancel=0;
+int count, quit = 0, cancel = 0;
char *whoami;
-#ifdef POSIX
sigjmp_buf jb;
-#else
-jmp_buf jb;
-#endif
#define MAXARGS 20
-#ifdef POSIX
-void
-#endif
-discard_input();
+void discard_input();
char *mr_gets();
-main(argc, argv)
- int argc;
- char **argv;
-{
- char cmdbuf[BUFSIZ];
-#ifdef POSIX
- struct sigaction action;
-#endif
-
- whoami = argv[0];
- interactive = (isatty(0) && isatty(1));
-
- initialize_sms_error_table();
- initialize_krb_error_table();
+int main(int argc, char **argv)
+{
+ char cmdbuf[BUFSIZ];
+ struct sigaction action;
-#ifdef USE_READLINE
- /* we don't want filename completion */
- rl_bind_key ('\t', rl_insert);
-#endif
+ whoami = argv[0];
+ interactive = (isatty(0) && isatty(1));
-#ifdef POSIX
- action.sa_handler = discard_input;
- action.sa_flags = 0;
- sigemptyset(&action.sa_mask);
- sigaction(SIGINT, &action, NULL);
- sigsetjmp(jb, 1);
-#else
- signal(SIGINT, discard_input);
- setjmp(jb);
+ initialize_sms_error_table();
+ initialize_krb_error_table();
+
+#ifdef USE_READLINE
+ /* we don't want filename completion */
+ rl_bind_key('\t', rl_insert);
#endif
- while(!quit) {
- if(!mr_gets("moira: ",cmdbuf,BUFSIZ)) break;
- execute_line(cmdbuf);
- }
- mr_disconnect();
- exit(0);
+ action.sa_handler = discard_input;
+ action.sa_flags = 0;
+ sigemptyset(&action.sa_mask);
+ sigaction(SIGINT, &action, NULL);
+ sigsetjmp(jb, 1);
+
+ while (!quit)
+ {
+ if (!mr_gets("moira: ", cmdbuf, BUFSIZ))
+ break;
+ execute_line(cmdbuf);
+ }
+ mr_disconnect();
+ exit(0);
}
-#ifdef POSIX
-void
-#else
-int
-#endif
-discard_input()
+void discard_input(void)
{
putc('\n', stdout);
/* if we're inside a script, we have to clean up file descriptors,
so don't jump out yet */
- if(recursion) {
- cancel=1;
- } else {
-#ifdef POSIX
+ if (recursion)
+ cancel = 1;
+ else
siglongjmp(jb, 1);
-#else
- longjmp(jb, 1);
-#endif
- }
}
-char *mr_gets(prompt, buf, len)
- char *prompt, *buf;
- size_t len;
+char *mr_gets(char *prompt, char *buf, size_t len)
{
char *in;
#ifdef USE_READLINE
- if(interactive) {
- in=readline(prompt);
-
- if (!in) return NULL;
- if (*in) {
- add_history(in);
+ if (interactive)
+ {
+ in = readline(prompt);
+
+ if (!in)
+ return NULL;
+ if (*in)
+ add_history(in);
+ strncpy(buf, in, len - 1);
+ buf[len] = 0;
+ free(in);
+
+ return buf;
}
- strncpy(buf, in, len-1);
- buf[len]=0;
- free(in);
-
- return buf;
- }
#endif
printf("%s", prompt);
fflush(stdout);
- in=fgets(buf, len, stdin);
- if(!in) return in;
- if(strchr(buf,'\n')) *(strchr(buf,'\n'))=0;
+ in = fgets(buf, len, stdin);
+ if (!in)
+ return in;
+ if (strchr(buf, '\n'))
+ *(strchr(buf, '\n')) = '\0';
return buf;
}
-execute_line(cmdbuf)
- char *cmdbuf;
+int execute_line(char *cmdbuf)
{
int argc;
char *argv[MAXARGS];
- argc=parse(cmdbuf, argv);
- if(argc==0) return;
- if(!strcmp(argv[0],"noop"))
+ argc = parse(cmdbuf, argv);
+ if (argc == 0)
+ return;
+ if (!strcmp(argv[0], "noop"))
test_noop();
- else if(!strcmp(argv[0],"connect") || !strcmp(argv[0],"c"))
+ else if (!strcmp(argv[0], "connect") || !strcmp(argv[0], "c"))
test_connect(argc, argv);
- else if(!strcmp(argv[0],"disconnect") || !strcmp(argv[0],"d"))
+ else if (!strcmp(argv[0], "disconnect") || !strcmp(argv[0], "d"))
test_disconnect();
- else if(!strcmp(argv[0],"host"))
+ else if (!strcmp(argv[0], "host"))
test_host();
- else if(!strcmp(argv[0],"new") || !strcmp(argv[0],"2"))
+ else if (!strcmp(argv[0], "new") || !strcmp(argv[0], "2"))
test_new();
- else if(!strcmp(argv[0],"old") || !strcmp(argv[0],"1"))
+ else if (!strcmp(argv[0], "old") || !strcmp(argv[0], "1"))
test_old();
- else if(!strcmp(argv[0],"motd"))
+ else if (!strcmp(argv[0], "motd"))
test_motd();
- else if(!strcmp(argv[0],"query") || !strcmp(argv[0],"qy"))
+ else if (!strcmp(argv[0], "query") || !strcmp(argv[0], "qy"))
test_query(argc, argv);
- else if(!strcmp(argv[0],"auth") || !strcmp(argv[0],"a"))
+ else if (!strcmp(argv[0], "auth") || !strcmp(argv[0], "a"))
test_auth(argc, argv);
- else if(!strcmp(argv[0],"access"))
+ else if (!strcmp(argv[0], "access"))
test_access(argc, argv);
- else if(!strcmp(argv[0],"dcm"))
+ else if (!strcmp(argv[0], "dcm"))
test_dcm();
- else if(!strcmp(argv[0],"script") || !strcmp(argv[0],"s"))
+ else if (!strcmp(argv[0], "script") || !strcmp(argv[0], "s"))
test_script(argc, argv);
- else if(!strcmp(argv[0],"list_requests") ||
- !strcmp(argv[0],"lr") || !strcmp(argv[0],"?"))
+ else if (!strcmp(argv[0], "list_requests") ||
+ !strcmp(argv[0], "lr") || !strcmp(argv[0], "?"))
test_list_requests();
- else if(!strcmp(argv[0],"quit") || !strcmp(argv[0],"Q"))
- quit=1;
- else fprintf(stderr, "moira: Unknown request \"%s\". Type \"?\" for a request list.\n", argv[0]);
+ else if (!strcmp(argv[0], "quit") || !strcmp(argv[0], "Q"))
+ quit = 1;
+ else
+ {
+ fprintf(stderr, "moira: Unknown request \"%s\". "
+ "Type \"?\" for a request list.\n", argv[0]);
+ }
}
-int
-parse(buf, argv)
- char *buf, *argv[MAXARGS];
+int parse(char *buf, char *argv[MAXARGS])
{
char *p;
int argc, num;
-
- if(!*buf) return 0;
-
- for(p=buf, argc=0, argv[0]=buf; *p && *p!='\n'; p++) {
- if(*p=='"') {
- char *d=p++;
- /* skip to close-quote, copying back over open-quote */
- while(*p!='"') {
- if(!*p || *p=='\n') {
- fprintf(stderr, "moira: Unbalanced quotes in command line\n");
- return 0;
+
+ if (!*buf)
+ return 0;
+
+ for (p = buf, argc = 0, argv[0] = buf; *p && *p != '\n'; p++)
+ {
+ if (*p == '"')
+ {
+ char *d = p++;
+ /* skip to close-quote, copying back over open-quote */
+ while (*p != '"')
+ {
+ if (!*p || *p == '\n')
+ {
+ fprintf(stderr,
+ "moira: Unbalanced quotes in command line\n");
+ return 0;
+ }
+ /* deal with \### or \\ */
+ if (*p == '\\')
+ {
+ if (*++p != '"' && (*p < '0' || *p > '9') && (*p != '\\'))
+ {
+ fprintf(stderr, "moira: Bad use of \\\n");
+ return 0;
+ }
+ else if (*p >= '0' && *p <= '9')
+ {
+ num = (*p - '0') * 64 + (*++p - '0') * 8 + (*++p - '0');
+ *p = num;
+ }
+ }
+ *d++ = *p++;
+ }
+ if (p == d + 1)
+ {
+ *d = '\0';
+ p++;
+ }
+ else
+ {
+ while (p >= d)
+ *p-- = ' ';
+ }
}
- if(*p=='\\') {
- if(*++p!='"' && (*p<'0' || *p>'9') && (*p!='\\')) {
- fprintf(stderr, "moira: Bad use of \\\n");
- return 0;
- } else if (*p>='0' && *p<='9') {
- num=(*p-'0')*64 + (*++p-'0')*8 + (*++p-'0');
- *p=num;
- }
+ if (*p == ' ' || *p == '\t')
+ {
+ /* skip whitespace */
+ for (*p++ = '\0'; *p == ' ' || *p == '\t'; p++)
+ ;
+ if (*p && *p != '\n')
+ argv[++argc] = p--;
}
- *d++= *p++;
- }
- if(p==d+1) {*d='\0'; p++;}
- else {while(p>=d) *p--=' ';}
}
- if(*p==' ' || *p=='\t') {
- /* skip whitespace */
- for(*p++='\0'; *p==' ' || *p=='\t'; p++);
- if(*p && *p!='\n') argv[++argc]=p--;
- }
- }
- if(*p=='\n') *p='\0';
- return argc+1;
+ if (*p == '\n')
+ *p = '\0';
+ return argc + 1;
}
-test_noop()
+int test_noop(void)
{
- int status = mr_noop();
- if (status) com_err("moira (noop)", status, "");
+ int status = mr_noop();
+ if (status)
+ com_err("moira (noop)", status, "");
}
-test_new()
+int test_new(void)
{
- sending_version_no = MR_VERSION_2;
+ sending_version_no = MR_VERSION_2;
}
-test_old()
+int test_old(void)
{
- sending_version_no = MR_VERSION_1;
+ sending_version_no = MR_VERSION_1;
}
-test_connect(argc, argv)
-int argc;
-char *argv[];
+int test_connect(int argc, char *argv[])
{
- char *server = "";
- int status;
-
- if (argc > 1) {
- server = argv[1];
- }
- status = mr_connect(server);
- if (status) com_err("moira (connect)", status, "");
+ char *server = "";
+ int status;
+
+ if (argc > 1)
+ server = argv[1];
+ status = mr_connect(server);
+ if (status)
+ com_err("moira (connect)", status, "");
}
-test_disconnect()
+int test_disconnect(void)
{
- int status = mr_disconnect();
- if (status) com_err("moira (disconnect)", status, "");
+ int status = mr_disconnect();
+ if (status)
+ com_err("moira (disconnect)", status, "");
}
-test_host()
+int test_host(void)
{
- char host[BUFSIZ];
- int status;
+ char host[BUFSIZ];
+ int status;
- memset(host, 0, sizeof(host));
+ memset(host, 0, sizeof(host));
- if (status = mr_host(host, sizeof(host) - 1))
- com_err("moira (host)", status, "");
- else
- printf("You are connected to host %s\n", host);
+ if ((status = mr_host(host, sizeof(host) - 1)))
+ com_err("moira (host)", status, "");
+ else
+ printf("You are connected to host %s\n", host);
}
-test_auth(argc, argv)
-int argc;
-char *argv[];
+int test_auth(int argc, char *argv[])
{
- int status;
+ int status;
- status = mr_auth("mrtest");
- if (status) com_err("moira (auth)", status, "");
+ status = mr_auth("mrtest");
+ if (status)
+ com_err("moira (auth)", status, "");
}
-test_script(argc, argv)
-int argc;
-char *argv[];
+int test_script(int argc, char *argv[])
{
- FILE *inp;
- char input[BUFSIZ], *cp;
- int status, oldstdout, oldstderr;
-
- if (recursion > 8) {
- com_err("moira (script)", 0, "too many levels deep in script files\n");
- return;
+ FILE *inp;
+ char input[BUFSIZ], *cp;
+ int status, oldstdout, oldstderr;
+
+ if (recursion > 8)
+ {
+ com_err("moira (script)", 0, "too many levels deep in script files\n");
+ return;
}
- if (argc < 2) {
- com_err("moira (script)", 0, "Usage: script input_file [ output_file ]");
- return;
+ if (argc < 2)
+ {
+ com_err("moira (script)", 0, "Usage: script input_file [ output_file ]");
+ return;
}
- inp = fopen(argv[1], "r");
- if (inp == NULL) {
- sprintf(input, "Cannot open input file %s", argv[1]);
- com_err("moira (script)", 0, input);
- return;
+ inp = fopen(argv[1], "r");
+ if (!inp)
+ {
+ sprintf(input, "Cannot open input file %s", argv[1]);
+ com_err("moira (script)", 0, input);
+ return;
}
- if (argc == 3) {
- printf("Redirecting output to %s\n", argv[2]);
- fflush(stdout);
- oldstdout = dup(1);
- close(1);
- status = open(argv[2], O_CREAT|O_WRONLY|O_APPEND, 0664);
- if (status != 1) {
- close(status);
- dup2(oldstdout, 1);
- argc = 2;
- sprintf(input, "Unable to redirect output to %s\n", argv[2]);
- com_err("moira (script)", errno, input);
- } else {
- fflush(stderr);
- oldstderr = dup(2);
- close(2);
- dup2(1, 2);
+ if (argc == 3)
+ {
+ printf("Redirecting output to %s\n", argv[2]);
+ fflush(stdout);
+ oldstdout = dup(1);
+ close(1);
+ status = open(argv[2], O_CREAT|O_WRONLY|O_APPEND, 0664);
+ if (status != 1)
+ {
+ close(status);
+ dup2(oldstdout, 1);
+ argc = 2;
+ sprintf(input, "Unable to redirect output to %s\n", argv[2]);
+ com_err("moira (script)", errno, input);
+ }
+ else
+ {
+ fflush(stderr);
+ oldstderr = dup(2);
+ close(2);
+ dup2(1, 2);
}
}
- recursion++;
-
- while(!cancel) {
- if (fgets(input, BUFSIZ, inp) == NULL)
- break;
- if ((cp = strchr(input, '\n')) != (char *)NULL)
- *cp = 0;
- if (input[0] == 0) {
- printf("\n");
- continue;
+ recursion++;
+
+ while (!cancel)
+ {
+ if (!fgets(input, BUFSIZ, inp))
+ break;
+ if ((cp = strchr(input, '\n')))
+ *cp = '\0';
+ if (input[0] == 0)
+ {
+ printf("\n");
+ continue;
}
- if (input[0] == '%') {
- for (cp = &input[1]; *cp && isspace(*cp); cp++);
- printf("Comment: %s\n", cp);
- continue;
+ if (input[0] == '%')
+ {
+ for (cp = &input[1]; *cp && isspace(*cp); cp++)
+ ;
+ printf("Comment: %s\n", cp);
+ continue;
}
- printf("Executing: %s\n", input);
- execute_line(input);
+ printf("Executing: %s\n", input);
+ execute_line(input);
}
- recursion--;
- if(!recursion) cancel=0;
-
- fclose(inp);
- if (argc == 3) {
- fflush(stdout);
- close(1);
- dup2(oldstdout, 1);
- close(oldstdout);
- fflush(stderr);
- close(2);
- dup2(oldstderr, 2);
- close(oldstderr);
+ recursion--;
+ if (!recursion)
+ cancel = 0;
+
+ fclose(inp);
+ if (argc == 3)
+ {
+ fflush(stdout);
+ close(1);
+ dup2(oldstdout, 1);
+ close(oldstdout);
+ fflush(stderr);
+ close(2);
+ dup2(oldstderr, 2);
+ close(oldstderr);
}
}
-print_reply(argc, argv)
- int argc;
- char **argv;
+int print_reply(int argc, char **argv)
{
- int i;
- for (i = 0; i < argc; i++) {
- if (i != 0) printf(", ");
- printf("%s", argv[i]);
- }
- printf("\n");
- count++;
- return(MR_CONT);
+ int i;
+ for (i = 0; i < argc; i++)
+ {
+ if (i != 0)
+ printf(", ");
+ printf("%s", argv[i]);
+ }
+ printf("\n");
+ count++;
+ return MR_CONT;
}
-test_query(argc, argv)
- int argc;
- char **argv;
+int test_query(int argc, char **argv)
{
- int status;
-#ifdef POSIX
- sigset_t sigs;
-#else
- int mask;
-#endif
+ int status;
+ sigset_t sigs;
- if (argc < 2) {
- com_err("moira (query)", 0, "Usage: query handle [ args ... ]");
- return;
- }
+ if (argc < 2)
+ {
+ com_err("moira (query)", 0, "Usage: query handle [ args ... ]");
+ return;
+ }
- count = 0;
- /* Don't allow ^C during the query: it will confuse libmoira's
- internal state. (Yay static variables) */
-#ifdef POSIX
- sigemptyset(&sigs);
- sigaddset(&sigs, SIGINT);
- sigprocmask(SIG_BLOCK, &sigs, NULL);
-#else
- mask = sigblock(SIGINT);
-#endif
- status = mr_query(argv[1], argc-2, argv+2, print_reply, (char *)NULL);
-#ifdef POSIX
- sigprocmask(SIG_UNBLOCK, &sigs, NULL);
-#else
- sigsetmask(mask);
-#endif
- printf("%d tuple%s\n", count, ((count == 1) ? "" : "s"));
- if (status) com_err("moira (query)", status, "");
+ count = 0;
+ /* Don't allow ^C during the query: it will confuse libmoira's
+ internal state. (Yay static variables) */
+ sigemptyset(&sigs);
+ sigaddset(&sigs, SIGINT);
+ sigprocmask(SIG_BLOCK, &sigs, NULL);
+ status = mr_query(argv[1], argc - 2, argv + 2, print_reply, NULL);
+ sigprocmask(SIG_UNBLOCK, &sigs, NULL);
+ printf("%d tuple%s\n", count, ((count == 1) ? "" : "s"));
+ if (status)
+ com_err("moira (query)", status, "");
}
-test_access(argc, argv)
- int argc;
- char **argv;
+int test_access(int argc, char **argv)
{
- int status;
- if (argc < 2) {
- com_err("moira (access)", 0, "Usage: access handle [ args ... ]");
- return;
- }
- status = mr_access(argv[1], argc-2, argv+2);
- if (status) com_err("moira (access)", status, "");
+ int status;
+ if (argc < 2)
+ {
+ com_err("moira (access)", 0, "Usage: access handle [ args ... ]");
+ return;
+ }
+ status = mr_access(argv[1], argc - 2, argv + 2);
+ if (status)
+ com_err("moira (access)", status, "");
}
-
-test_dcm(argc, argv)
- int argc;
- char **argv;
+int test_dcm(int argc, char **argv)
{
- int status;
+ int status;
- if (status = mr_do_update())
- com_err("moira (dcm)", status, " while triggering dcm");
+ if ((status = mr_do_update()))
+ com_err("moira (dcm)", status, " while triggering dcm");
}
-
-test_motd(argc, argv)
- int argc;
- char **argv;
+int test_motd(int argc, char **argv)
{
- int status;
- char *motd;
-
- if (status = mr_motd(&motd))
- com_err("moira (motd)", status, " while getting motd");
- if (motd)
- printf("%s\n", motd);
- else
- printf("No message of the day.\n");
+ int status;
+ char *motd;
+
+ if ((status = mr_motd(&motd)))
+ com_err("moira (motd)", status, " while getting motd");
+ if (motd)
+ printf("%s\n", motd);
+ else
+ printf("No message of the day.\n");
}
-test_list_requests()
+int test_list_requests(void)
{
- printf("Available moira requests:\n");
- printf("\n");
- printf("noop\t\t\tAsk Moira to do nothing\n");
- printf("connect, c\t\tConnect to Moira server\n");
- printf("disconnect, d\t\tDisconnect from server\n");
- printf("host\t\t\tIdentify the server host\n");
- printf("new, 2\t\t\tUse new protocol\n");
- printf("old, 1\t\t\tUse old protocol\n");
- printf("motd, m\t\t\tGet the Message of the Day\n");
- printf("query, qy\t\tMake a query.\n");
- printf("auth, a\t\t\tAuthenticate to Moira.\n");
- printf("access\t\t\tCheck access to a Moira query.\n");
- printf("dcm\t\t\tTrigger the DCM\n");
- printf("script, s\t\tRead commands from a script.\n");
- printf("list_requests, lr, ?\tList available commands.\n");
- printf("quit, Q\t\t\tLeave the subsystem.\n");
+ printf("Available moira requests:\n");
+ printf("\n");
+ printf("noop\t\t\tAsk Moira to do nothing\n");
+ printf("connect, c\t\tConnect to Moira server\n");
+ printf("disconnect, d\t\tDisconnect from server\n");
+ printf("host\t\t\tIdentify the server host\n");
+ printf("new, 2\t\t\tUse new protocol\n");
+ printf("old, 1\t\t\tUse old protocol\n");
+ printf("motd, m\t\t\tGet the Message of the Day\n");
+ printf("query, qy\t\tMake a query.\n");
+ printf("auth, a\t\t\tAuthenticate to Moira.\n");
+ printf("access\t\t\tCheck access to a Moira query.\n");
+ printf("dcm\t\t\tTrigger the DCM\n");
+ printf("script, s\t\tRead commands from a script.\n");
+ printf("list_requests, lr, ?\tList available commands.\n");
+ printf("quit, Q\t\t\tLeave the subsystem.\n");
}
andersk / moira.git / blobdiff