File contents

Index: 0.1/src/prcserror.tl
32c32
< template class PrError<pid_t>;
---
> /* template class PrError<pid_t>; */
77c77
< MkTemplate(PrError, pid_t);
---
> /* MkTemplate(PrError, pid_t); */
Index: 0.1/src/docs.cc
30,38c30,38
< SystemCommand rcs_command("/usr/sww/bin/GNU/rcs", "RCS_PATH");
< SystemCommand ci_command("/usr/sww/bin/GNU/ci", "RCS_PATH");
< SystemCommand co_command("/usr/sww/bin/GNU/co", "RCS_PATH");
< SystemCommand rlog_command("/usr/sww/bin/GNU/rlog", "RCS_PATH");
< SystemCommand tar_command("/usr/sww/bin/GNU/tar", "RCS_PATH");
< SystemCommand gdiff3_command("/usr/sww/bin/GNU/diff3", "RCS_PATH");
< SystemCommand gdiff_command("/usr/sww/bin/GNU/diff", "RCS_PATH");
< SystemCommand ls_command("/usr/sww/bin/GNU/ls", "RCS_PATH");
< SystemCommand gzip_command("/usr/sww/bin/GNU/gzip", "RCS_PATH");
---
> SystemCommand rcs_command("/usr/bin/rcs", "RCS_PATH");
> SystemCommand ci_command("/usr/bin/ci", "RCS_PATH");
> SystemCommand co_command("/usr/bin/co", "RCS_PATH");
> SystemCommand rlog_command("/usr/bin/rlog", "RCS_PATH");
> SystemCommand tar_command("/bin/tar", "RCS_PATH");
> SystemCommand gdiff3_command("/usr/bin/diff3", "RCS_PATH");
> SystemCommand gdiff_command("/usr/bin/diff", "RCS_PATH");
> SystemCommand ls_command("/bin/ls", "RCS_PATH");
> SystemCommand gzip_command("/bin/gzip", "RCS_PATH");
46c46
<   { "PRCS_REPOSITORY", "/users/jmacd/PRCS" },
---
>   { "PRCS_REPOSITORY", "/home/PRCS" },
48,49c48,49
<   { "PRCS_MERGE_COMMAND", NULL },
<   { "PRCS_LOGQUERY", NULL },
---
>   { "PRCS_MERGE_COMMAND", "prcs-ediff" },
>   { "PRCS_LOGQUERY", "1" },
51c51
<   { "PRCS_DIFF_OPTIONS", "-c" },
---
>   { "PRCS_DIFF_OPTIONS", "-b -B" },
Index: 0.1/src/checkin.cc
396a397,464
> static PrVoidError maybe_changlog_for_a_file(const char *fn, char *chlog)
> {
>     int tty, c, lc, llc, i=0;
> 
>     if ( option_force_resolution )
>         return NoError;
> 
>     tty = isatty(STDIN_FILENO);
> 
>     if(tty) {
> 	prcsquery << "Changlog for file: \t\t" << fn << '\n'
> 		  << option('e', "Enter version log now")
> 		  << defopt('p', "Proceed with an empty version log")
> 		  << query("Enter a log, or proceed");
> 
> 	char c;
> 
> 	Return_if_fail(c << prcsquery.result());
> 
> 	if(c == 'p')
> 	    return NoError;
> 
>         prcsoutput << "Enter description terminated by a single '.' or EOF" << dotendl;
> 
> 	fprintf(stdout, ">> ");
>     }
> 
>     re_query_message = ">> ";
>     re_query_len = 3;
> 
>     lc = '\n';
>     llc = '\n';
> 
>     while(true) {
> 	If_fail(c << Err_fgetc(stdin))
> 	    pthrow prcserror << "Read failure on stdin" << perror;
> 
> 	if (c == EOF  || i == 1023) {
> 	    /* fprintf (stdout, "\n"); */
> 	    break;
> 	}
> 
>         if(tty && c == '\n') {
>             if(lc == '.' && llc == '\n') {
>                 i--;
>                 break;
>             }
>             fprintf(stdout, ">> ");
>         }
> 
>         llc = lc;
>         lc = c;
> 
>         chlog[i++] = c;
>     }
> 
>     chlog[i] = '\0';
> 
>     if(tty) fprintf(stdout, "Done.\n");
> 
>     /* I don't think its possible that PRCS will ever need to query the
>      * user after this, but I might as well reopen it. */
>     if(freopen(ctermid(NULL), "r", stdin) == NULL)
> 	pthrow prcserror << "Couldn't reopen the standard input" << perror;
> 
>     return NoError;
> }
> 
401a470,472
>     char chlog[1024];
>     const char *m;
> 
407a479,485
>         chlog[0] = '\0';
>         if ( (m = fe->descriptor_version_number()) != NULL && m[0] ) {
>            Return_if_fail(maybe_changlog_for_a_file(fe->working_path(), chlog));
>            if ( chlog[0] == '\0' ) { strcpy(chlog, "<none>"); }
>         }
>         else { strcpy(chlog, "Initial revision\n"); }
> 
414d491
<     }
416,422c493,494
<     Dstring rlog;
< 
<     rlog.sprintf (rlog_header, prcs_version_number[0],
< 		  prcs_version_number[1],
< 		  prcs_version_number[2]);
< 
<     Return_if_fail(VC_checkin(NULL, NULL, NULL, rlog, NULL, checkin_hook));
---
>         Return_if_fail(VC_checkin(NULL, NULL, NULL, chlog, NULL, checkin_hook));
>     }
586c658
< 	    fprintf (stdout, "\n");
---
> 	    /* fprintf (stdout, "\n"); */
Index: 0.1/src/projdesc.cc
966c966
<     project_descriptor.sprintf("%s.prj", project_name(), project_name());
---
>     project_descriptor.sprintf("%s.prj", project_name());