is a secure replacement for inetd, the internet services daemon (openSUSE fork).
| siosup.c (xinetd-2.3.15) | : | siosup.c (xinetd-2.3.15.4.tar.xz) |
|---|
| | |
| skipping to change at line 413 | | skipping to change at line 413 |
|---|
| odp->start = odp->nextb = odp->buf ; | | odp->start = odp->nextb = odp->buf ; |
| if ( isatty( fd ) ) | | if ( isatty( fd ) ) |
| odp->buftype = SIO_LINEBUF ; | | odp->buftype = SIO_LINEBUF ; |
| | |
| if ( fd == 2 ) | | if ( fd == 2 ) |
| odp->buftype = SIO_NOBUF ; | | odp->buftype = SIO_NOBUF ; |
| | |
| return( SUCCESS ) ; | | return( SUCCESS ) ; |
| } | | } |
| | |
|
| #ifndef HAVE_ISATTY | | |
| | |
| #ifdef HAVE_SYSVTTY | | |
| | |
| #include <termio.h> | | |
| | |
| static int isatty( int fd ) | | |
| { | | |
| struct termio t ; | | |
| | |
| if ( ioctl( fd, TCGETA, &t ) == -1 && errno == ENOTTY ) | | |
| return( FALSE ) ; | | |
| else | | |
| return( TRUE ) ; | | |
| } | | |
| #endif /* HAVE_SYSVTTY */ | | |
| | |
| #ifdef HAVE_BSDTTY | | |
| | |
| #include <sgtty.h> | | |
| | |
| static int isatty( int fd ) | | |
| { | | |
| struct sgttyb s ; | | |
| | |
| if ( ioctl( fd, TIOCGETP, &s ) == -1 && errno == ENOTTY ) | | |
| return( FALSE ) ; | | |
| else | | |
| return( TRUE ) ; | | |
| } | | |
| #endif /* HAVE_BSDTTY */ | | |
| | |
| #endif /* ! HAVE_ISATTY */ | | |
| | | |
| /* | | /* |
| * Initialize stream I/O for a file descriptor. | | * Initialize stream I/O for a file descriptor. |
| * | | * |
| * Arguments: | | * Arguments: |
| * fd: file descriptor | | * fd: file descriptor |
| * dp: descriptor pointer | | * dp: descriptor pointer |
| * stream_type: either __SIO_INPUT_STREAM or __SIO_OUTPUT_STREAM | | * stream_type: either __SIO_INPUT_STREAM or __SIO_OUTPUT_STREAM |
| * | | * |
| * Returns | | * Returns |
| * 0 if successful | | * 0 if successful |
| | |
| skipping to change at line 785 | | skipping to change at line 751 |
|---|
| mapd_s *mdp = MDP( fd ) ; | | mapd_s *mdp = MDP( fd ) ; |
| | |
| if ( mdp->first_unit.addr != CHAR_NULL ) | | if ( mdp->first_unit.addr != CHAR_NULL ) |
| (void) SIO_MUNMAP( mdp->first_unit.addr, | | (void) SIO_MUNMAP( mdp->first_unit.addr, |
| mdp->first_unit.mapped_bytes ) ; | | mdp->first_unit.mapped_bytes ) ; |
| if ( mdp->second_unit.addr != CHAR_NULL ) | | if ( mdp->second_unit.addr != CHAR_NULL ) |
| (void) SIO_MUNMAP( mdp->second_unit.addr, | | (void) SIO_MUNMAP( mdp->second_unit.addr, |
| mdp->second_unit.mapped_bytes ) ; | | mdp->second_unit.mapped_bytes ) ; |
| idp->memory_mapped = FALSE ; | | idp->memory_mapped = FALSE ; |
| } | | } |
|
| else | | |
| #endif /* HAVE_MMAP */ | | #endif /* HAVE_MMAP */ |
| free( idp->buf - idp->buffer_size ) ; | | free( idp->buf - idp->buffer_size ) ; |
| idp->nextb = idp->end = NULL ; | | idp->nextb = idp->end = NULL ; |
| } | | } |
| break ; | | break ; |
| | |
| case __SIO_OUTPUT_STREAM: | | case __SIO_OUTPUT_STREAM: |
| { | | { |
| __sio_od_t *odp = ODP( dp ) ; | | __sio_od_t *odp = ODP( dp ) ; |
| | |
| | | |
| End of changes. 2 change blocks. |
|---|
| 35 lines changed or deleted | | 0 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 