From: Paul Mackerras <paulus@ozlabs.org>
Date: Mon, 27 Sep 2021 07:12:00 +0000 (+1000)
Subject: Merge branch 'fix-compiler-warnings-2' of https://github.com/enaess/ppp
X-Git-Tag: ppp-2.5.0~56
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=eff574c871822c7e2788aa8a928f2480fa7a6cb3;hp=-c;p=ppp.git

Merge branch 'fix-compiler-warnings-2' of https://github.com/enaess/ppp

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
---

eff574c871822c7e2788aa8a928f2480fa7a6cb3
diff --combined pppd/sys-linux.c
index 513fc3d,4c04e7e..1e00366
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@@ -96,6 -96,7 +96,6 @@@
  #include <signal.h>
  #include <fcntl.h>
  #include <ctype.h>
 -#include <termios.h>
  #include <unistd.h>
  
  /* This is in netdevice.h. However, this compile will fail miserably if
@@@ -109,6 -110,7 +109,6 @@@
  
  #if !defined(__GLIBC__) || __GLIBC__ >= 2
  #include <asm/types.h>		/* glibc 2 conflicts with linux/types.h */
 -#include <asm/ioctls.h>
  #include <net/if.h>
  #include <net/if_arp.h>
  #include <net/route.h>
@@@ -163,11 -165,19 +163,11 @@@
  #include <sys/locks.h>
  #endif
  
 -#ifndef BOTHER
 -#define BOTHER 0010000
 -#endif
 -struct termios2 {
 -	unsigned int c_iflag;
 -	unsigned int c_oflag;
 -	unsigned int c_cflag;
 -	unsigned int c_lflag;
 -	unsigned char c_line;
 -	unsigned char c_cc[19];
 -	unsigned int c_ispeed;
 -	unsigned int c_ospeed;
 -};
 +/*
 + * Instead of system header file <termios.h> use local "termios_linux.h" header
 + * file as it provides additional support for arbitrary baud rates via BOTHER.
 + */
 +#include "termios_linux.h"
  
  #ifdef INET6
  #ifndef _LINUX_IN6_H
@@@ -1043,32 -1053,40 +1043,32 @@@ void set_up_tty(int tty_fd, int local
  	    cfsetospeed (&tios, speed);
  	    cfsetispeed (&tios, speed);
  	    speed = cfgetospeed(&tios);
 +	    baud_rate = baud_rate_of(speed);
 +	} else {
 +#ifdef BOTHER
 +	    tios.c_cflag &= ~CBAUD;
 +	    tios.c_cflag |= BOTHER;
 +	    tios.c_ospeed = inspeed;
 +#ifdef IBSHIFT
 +	    /* B0 sets input baudrate to the output baudrate */
 +	    tios.c_cflag &= ~(CBAUD << IBSHIFT);
 +	    tios.c_cflag |= B0 << IBSHIFT;
 +	    tios.c_ispeed = inspeed;
 +#endif
 +	    baud_rate = inspeed;
 +#else
 +	    baud_rate = 0;
 +#endif
  	}
 -	baud_rate = baud_rate_of(speed);
      }
      else {
  	speed = cfgetospeed(&tios);
  	baud_rate = baud_rate_of(speed);
 -    }
 -
 -    while (tcsetattr(tty_fd, TCSAFLUSH, &tios) < 0 && !ok_error(errno))
 -	if (errno != EINTR)
 -	    fatal("tcsetattr: %m (line %d)", __LINE__);
 -    restore_term = 1;
 -
 -/* Most Linux architectures and drivers support arbitrary baud rate values via BOTHER */
 -#ifdef TCGETS2
 -    if (!baud_rate) {
 -	struct termios2 tios2;
 -	if (ioctl(tty_fd, TCGETS2, &tios2) == 0) {
 -	    if (inspeed) {
 -		tios2.c_cflag &= ~CBAUD;
 -		tios2.c_cflag |= BOTHER;
 -		tios2.c_ispeed = inspeed;
 -		tios2.c_ospeed = inspeed;
 -#ifdef TCSETS2
 -		if (ioctl(tty_fd, TCSETS2, &tios2) == 0)
 -		    baud_rate = inspeed;
 +#ifdef BOTHER
 +	if (!baud_rate)
 +	    baud_rate = tios.c_ospeed;
  #endif
 -	    } else {
 -		if ((tios2.c_cflag & CBAUD) == BOTHER && tios2.c_ospeed)
 -		    baud_rate = tios2.c_ospeed;
 -	    }
 -	}
      }
 -#endif
  
  /*
   * We can't proceed if the serial port baud rate is unknown,
@@@ -1080,11 -1098,6 +1080,11 @@@
  	else
  	    fatal("Baud rate for %s is 0; need explicit baud rate", devnam);
      }
 +
 +    while (tcsetattr(tty_fd, TCSAFLUSH, &tios) < 0 && !ok_error(errno))
 +	if (errno != EINTR)
 +	    fatal("tcsetattr: %m (line %d)", __LINE__);
 +    restore_term = 1;
  }
  
  /********************************************************************
@@@ -3130,7 -3143,7 +3130,7 @@@ int cif6addr (int unit, eui64_t our_eui
  int
  get_pty(int *master_fdp, int *slave_fdp, char *slave_name, int uid)
  {
-     int i, mfd, sfd = -1;
+     int i, mfd, ret, sfd = -1;
      char pty_name[16];
      struct termios tios;
  
@@@ -3168,8 -3181,14 +3168,14 @@@
  		pty_name[5] = 't';
  		sfd = open(pty_name, O_RDWR | O_NOCTTY, 0);
  		if (sfd >= 0) {
- 		    fchown(sfd, uid, -1);
- 		    fchmod(sfd, S_IRUSR | S_IWUSR);
+ 		    ret = fchown(sfd, uid, -1);
+ 		    if (ret != 0) {
+ 			warn("Couldn't change ownership of %s, %m", pty_name);
+ 		    }
+ 		    ret = fchmod(sfd, S_IRUSR | S_IWUSR);
+ 		    if (ret != 0) {
+ 			warn("Couldn't change permissions of %s, %m", pty_name);
+ 		    }
  		    break;
  		}
  		close(mfd);