pts-process-input-file-and-exit-20080318

LICENSE IPL10

 The pts program has a command 'source' to read commands from
 a file.  In the interactive "shell" mode, this command works,
 reading and executing commands until the end of the file and
 then returning to the command shell.

 This command is valid for use as a command line option, but
 does not work. It requires a valid filename as an argument,
 but does not process the file, instead just dropping the user
 into the interactive mode.

 When given as a command line option, pts source SHOULD read
 the file, execute the commands and then exit, according to
 the documentation. It does not currently do this and should
 be fixed.

diff --git a/src/ptserver/pts.c b/src/ptserver/pts.c
index 60809d98171002d92b6d6f02d8c686ae0287dd13..bd8673102f5e5eefcdb0c28e978d54b40f0a1c88 100644 (file)
--- a/src/ptserver/pts.c
+++ b/src/ptserver/pts.c
@@ -59,6 +59,7 @@ struct authstate {
 int
 pts_Interactive(struct cmd_syndesc *as, void *arock)
 {
+    source = stdin;
     finished = 0;
     return 0;
 }
@@ -1177,12 +1178,12 @@ main(int argc, char **argv)
     cmd_SetBeforeProc(GetGlobals, &state);
 
     finished = 1;
-    source = stdin;
+    source = NULL;
     if (code = cmd_Dispatch(argc, argv)) {
        CleanUp(NULL, NULL);
        exit(1);
     }
-    while (!finished) {
+    while (source && !finished) {
        if (isatty(fileno(source)))
            fprintf(stderr, "pts> ");
        if (!fgets(line, sizeof line, source)) {