[2854] in SIPB bug reports
SS changes for system 5
daemon@ATHENA.MIT.EDU (John Carr)
Thu May 21 20:33:06 1992
To: bug-sipb@Athena.MIT.EDU
Date: Thu, 21 May 1992 20:32:36 EDT
From: John Carr <jfc@Athena.MIT.EDU>
These are some diffs a Kerberos developer sent to make ss build on
UNIX system 5.
diff -cr changed_src/ss/Imakefile ss/Imakefile
diff -cr changed_src/ss/cmd_tbl.l ss/cmd_tbl.l
*** changed_src/ss/cmd_tbl.l Wed Oct 16 11:49:49 1991
--- ss/cmd_tbl.l Wed Oct 16 11:51:14 1991
***************
*** 72,78 ****
--- 72,82 ----
{
register char *p;
yylval.dynstr = ds(yytext+1);
+ #ifdef unicos61
+ if (p=(char *) rindex(yylval.dynstr, '"'))
+ #else
if (p=rindex(yylval.dynstr, '"'))
+ #endif /* unicos61 */
*p='\0';
last_token = ds(yylval.dynstr);
return STRING;
Only in changed_src/ss: cmd_tbl.l_orig
Only in ss: commands.ct
Only in ss: copyright.h
Only in ss: ct.y
Only in ss: data.c
diff -cr changed_src/ss/error.c ss/error.c
*** changed_src/ss/error.c Mon Jul 8 16:22:45 1991
--- ss/error.c Mon Jul 8 16:23:12 1991
***************
*** 20,26 ****
#endif
#include "copyright.h"
! #include <com_err.h>
#include "ss_internal.h"
#undef ss_error
--- 20,26 ----
#endif
#include "copyright.h"
! #include "../com_err/com_err.h"
#include "ss_internal.h"
#undef ss_error
Only in changed_src/ss: error.c_orig
Only in ss: execute_cmd.c
diff -cr changed_src/ss/help.c ss/help.c
*** changed_src/ss/help.c Wed Oct 16 11:50:13 1991
--- ss/help.c Thu Feb 20 13:42:45 1992
***************
*** 5,10 ****
--- 5,19 ----
*/
#include <sys/param.h>
+ #ifdef unicos61
+ #include <sys/types.h>
+ #define MAXPATHLEN PATHSIZE
+ #include <sys/fcntl.h>
+ #include <dirent.h>
+ #endif /* unicos61 */
+ #if defined(sysvimp) || defined(aux20)
+ #include <sys/types.h>
+ #endif /* sysvimp */
#include <sys/file.h>
#include <sys/wait.h>
#include "ss_internal.h"
***************
*** 74,80 ****
--- 83,93 ----
ss_page_stdin();
default:
(void) close(fd); /* what can we do if it fails? */
+ #ifdef unicos61
+ while (wait((int *)NULL) != child) {
+ #else
while (wait((union wait *)NULL) != child) {
+ #endif /* unicos61 */
/* do nothing if wrong pid */
};
}
Only in changed_src/ss: help.c_orig
Only in ss: invocation.c
diff -cr changed_src/ss/list_rqs.c ss/list_rqs.c
*** changed_src/ss/list_rqs.c Wed Oct 16 11:50:46 1991
--- ss/list_rqs.c Wed Oct 16 11:51:40 1991
***************
*** 35,46 ****
FILE *output;
int fd;
int mask;
! #ifdef POSIX
void (*func)();
#else
int (*func)();
- #endif
union wait waitb;
DONT_USE(argc);
DONT_USE(argv);
--- 35,47 ----
FILE *output;
int fd;
int mask;
! #if defined (POSIX) || defined(unicos61)
void (*func)();
+ int waitb;
#else
int (*func)();
union wait waitb;
+ #endif
DONT_USE(argc);
DONT_USE(argv);
Only in changed_src/ss: list_rqs.c_orig
diff -cr changed_src/ss/listen.c ss/listen.c
*** changed_src/ss/listen.c Wed Oct 16 11:49:59 1991
--- ss/listen.c Wed Oct 16 11:51:19 1991
***************
*** 24,30 ****
"$Header: /afs/rel-eng.athena.mit.edu/project/release/current/source/athena/athena.lib/ss/RCS/listen.c,v 1.2 90/07/12 12:28:58 epeisach Exp $";
#endif
! #ifdef POSIX
#define sigtype void
#else
#define sigtype int
--- 24,30 ----
"$Header: /afs/rel-eng.athena.mit.edu/project/release/current/source/athena/athena.lib/ss/RCS/listen.c,v 1.2 90/07/12 12:28:58 epeisach Exp $";
#endif
! #if defined (POSIX) || defined(unicos61)
#define sigtype void
#else
#define sigtype int
***************
*** 81,87 ****
--- 81,91 ----
info->abort = 0;
mask = sigblock(sigmask(SIGINT));
bcopy(listen_jmpb, old_jmpb, sizeof(jmp_buf));
+ #ifdef unicos61
sig_int = signal(SIGINT, listen_int_handler);
+ #else
+ sig_int = signal(SIGINT, listen_int_handler);
+ #endif /* unicos61 */
setjmp(listen_jmpb);
(void) sigsetmask(mask);
while(!info->abort) {
***************
*** 88,94 ****
--- 92,102 ----
print_prompt();
*end = '\0';
old_sig_cont = sig_cont;
+ #ifdef unicos61
+ sig_cont = signal(SIGCONT, print_prompt);
+ #else
sig_cont = signal(SIGCONT, print_prompt);
+ #endif /* unicos61 */
#ifdef mips
/* The mips compiler breaks on determining the types,
we help */
Only in changed_src/ss: listen.c_orig
Only in ss: mit-sipb-copyright.h
diff -cr changed_src/ss/mk_cmds.c ss/mk_cmds.c
*** changed_src/ss/mk_cmds.c Wed Oct 16 11:49:32 1991
--- ss/mk_cmds.c Thu Feb 20 13:40:17 1992
***************
*** 12,17 ****
--- 12,24 ----
#include "copyright.h"
#include <stdio.h>
#include <sys/param.h>
+ #ifdef unicos61
+ #include <sys/types.h>
+ #define MAXPATHLEN PATHSIZE
+ #endif /* unicos61 */
+ #if defined (sysvimp) || defined(aux20)
+ #include <sys/types.h>
+ #endif /* sysvimp */
#include <sys/file.h>
#include <strings.h>
#include "ss_internal.h"
Only in changed_src/ss: mk_cmds.c_orig
Only in ss: options.c
diff -cr changed_src/ss/pager.c ss/pager.c
*** changed_src/ss/pager.c Wed Oct 16 11:50:53 1991
--- ss/pager.c Thu Feb 20 13:43:14 1992
***************
*** 10,15 ****
--- 10,18 ----
#include "ss_internal.h"
#include "copyright.h"
#include <stdio.h>
+ #if defined (unicos61) || defined (sysvimp) || defined (aux20)
+ #include <sys/types.h>
+ #endif /* unicos61 */
#include <sys/file.h>
#include <signal.h>
Only in changed_src/ss: pager.c_orig
Only in ss: parse.c
Only in ss: profiled
Only in ss: prompt.c
Only in ss: request_tbl.c
Only in ss: requests.c
Only in ss: ss.h
Only in ss: ss_err.et
Only in ss: ss_internal.h
Only in ss: std_rqs.ct
Only in ss: test.c
Only in ss: utils.c
