mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
- Remove useless inclusion of <sgtty.h>
PR: 110851 Submitted by: Ed Schouten <ed@fxq.nl>
This commit is contained in:
parent
43f1cc100e
commit
108a8c42e4
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=188456
2 changed files with 42 additions and 68 deletions
|
@ -1,66 +0,0 @@
|
||||||
*** server.c.orig Sat Jun 26 16:23:23 1993
|
|
||||||
--- server.c Sun Sep 19 16:48:42 1999
|
|
||||||
***************
|
|
||||||
*** 66,72 ****
|
|
||||||
#else
|
|
||||||
char *malloc();
|
|
||||||
#endif
|
|
||||||
! long time();
|
|
||||||
uid_t getuid();
|
|
||||||
char *progname;
|
|
||||||
int debug = 0;
|
|
||||||
--- 66,72 ----
|
|
||||||
#else
|
|
||||||
char *malloc();
|
|
||||||
#endif
|
|
||||||
! time_t time();
|
|
||||||
uid_t getuid();
|
|
||||||
char *progname;
|
|
||||||
int debug = 0;
|
|
||||||
***************
|
|
||||||
*** 99,118 ****
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! strcmp (basename (progname), "rmsgd")) {
|
|
||||||
if (fork()) _exit(0); /* make myself a daemon */
|
|
||||||
! #ifdef BSD
|
|
||||||
fd = open("/dev/tty", O_RDWR); /* disconnect from control tty */
|
|
||||||
if (fd >= 0) {
|
|
||||||
(void) ioctl(fd, TIOCNOTTY, (char *)0);
|
|
||||||
(void) close(fd); /* close this, don't need any more*/
|
|
||||||
}
|
|
||||||
! #else
|
|
||||||
(void) setpgrp ();
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
else {
|
|
||||||
! (void) fprintf (stderr, "Starting from inetd not yet supported, rename me ase rmsgd and start\nfrom /etc/rc\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (argc > 1)
|
|
||||||
--- 99,122 ----
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! strcmp (basename (progname), "rmsgd")) {
|
|
||||||
+ #if (defined(BSD) && (BSD >= 199306))
|
|
||||||
+ (void)daemon(0,0);
|
|
||||||
+ #else
|
|
||||||
if (fork()) _exit(0); /* make myself a daemon */
|
|
||||||
! # ifdef BSD
|
|
||||||
fd = open("/dev/tty", O_RDWR); /* disconnect from control tty */
|
|
||||||
if (fd >= 0) {
|
|
||||||
(void) ioctl(fd, TIOCNOTTY, (char *)0);
|
|
||||||
(void) close(fd); /* close this, don't need any more*/
|
|
||||||
}
|
|
||||||
! # else
|
|
||||||
(void) setpgrp ();
|
|
||||||
+ # endif
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
else {
|
|
||||||
! (void) fprintf (stderr, "Starting from inetd not yet supported, rename me ase rmsgd and start\nfrom /etc/rc.local\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (argc > 1)
|
|
|
@ -1,6 +1,46 @@
|
||||||
--- server.c Tue Jun 4 21:40:19 2002
|
--- server.c Tue Jun 4 21:40:19 2002
|
||||||
+++ server.c Tue Jun 4 21:42:56 2002
|
+++ server.c Tue Jun 4 21:42:56 2002
|
||||||
@@ -146,7 +146,7 @@
|
@@ -54,7 +54,6 @@
|
||||||
|
#endif /* USG5 || SVR4 */
|
||||||
|
|
||||||
|
#include <sys/param.h>
|
||||||
|
-#include <sgtty.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
|
||||||
|
@@ -66,7 +65,7 @@
|
||||||
|
#else
|
||||||
|
char *malloc();
|
||||||
|
#endif
|
||||||
|
-long time();
|
||||||
|
+time_t time();
|
||||||
|
uid_t getuid();
|
||||||
|
char *progname;
|
||||||
|
int debug = 0;
|
||||||
|
@@ -99,6 +98,9 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! strcmp (basename (progname), "rmsgd")) {
|
||||||
|
+#if (defined(BSD) && (BSD >= 199306))
|
||||||
|
+ (void)daemon(0,0);
|
||||||
|
+#else
|
||||||
|
if (fork()) _exit(0); /* make myself a daemon */
|
||||||
|
#ifdef BSD
|
||||||
|
fd = open("/dev/tty", O_RDWR); /* disconnect from control tty */
|
||||||
|
@@ -109,10 +111,11 @@
|
||||||
|
#else
|
||||||
|
(void) setpgrp ();
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
else {
|
||||||
|
- (void) fprintf (stderr, "Starting from inetd not yet supported, rename me ase rmsgd and start\nfrom /etc/rc\n");
|
||||||
|
+ (void) fprintf (stderr, "Starting from inetd not yet supported, rename me ase rmsgd and start\nfrom /etc/rc.local\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (argc > 1)
|
||||||
|
@@ -142,7 +145,7 @@
|
||||||
{
|
{
|
||||||
int child, pid, fd;
|
int child, pid, fd;
|
||||||
unsigned int retval = 0;
|
unsigned int retval = 0;
|
||||||
|
@ -9,7 +49,7 @@
|
||||||
int status;
|
int status;
|
||||||
#else
|
#else
|
||||||
union wait status;
|
union wait status;
|
||||||
@@ -202,6 +202,9 @@
|
@@ -198,6 +201,9 @@
|
||||||
#if defined(HPUX) || defined(SVR4)
|
#if defined(HPUX) || defined(SVR4)
|
||||||
if (status & 0xff) retval = -1;
|
if (status & 0xff) retval = -1;
|
||||||
else retval = ((status & 0xffff) >> 8);
|
else retval = ((status & 0xffff) >> 8);
|
||||||
|
|
Loading…
Add table
Reference in a new issue