Attachment 2925 Details for Bug 3957 – AIX changes to Xtranslcl.c

[patch] AIX changes to Xtranslcl.c

Xtranslcl.c.patch (text/plain), 2.36 KB, created by Dan McNichol on 2005-08-18 21:08:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan McNichol

Created: 2005-08-18 21:08:26 UTC

Size: 2.36 KB

patch

obsolete

>*** Xtranslcl.c.orig    Fri Apr 23 13:44:27 2004
>--- Xtranslcl.c Tue Aug  2 14:55:13 2005
>***************
>*** 224,236 ****
>--- 224,241 ----
>  #ifndef X11_t
>  #define X_STREAMS_DIR "/dev/X"
>  #else
>  #define X_STREAMS_DIR "/tmp/.X11-pipe"
>  #endif
>  #endif
>+
>+ #ifdef _AIX
>+ #define DEV_PTMX      "/dev/ptc"
>+ #else
>  #define DEV_PTMX      "/dev/ptmx"
>+ #endif
>
>  #if defined(X11_t)
>
>  #define PTSNODENAME "/dev/X/server."
>  #ifndef sun
>  #define NAMEDNODENAME "/dev/X/Nserver."
>***************
>*** 316,330 ****
> 
>
>      /*
>       * Open the streams based pipe that will be this connection.
>       */
> 
>!     if ((fd = open("/dev/ptmx", O_RDWR)) < 0) {
>!       PRMSG(1,"PTSOpenClient: failed to open /dev/ptmx\n", 0,0,0);
>!       return -1;
>      }
> 
>      (void) grantpt(fd);
>      (void) unlockpt(fd);
> 
>      slave = ptsname(fd); /* get name */
>--- 321,335 ----
> 
>
>      /*
>       * Open the streams based pipe that will be this connection.
>       */
> 
>!     if( (fd=open(DEV_PTMX, O_RDWR)) < 0) {
>!         PRMSG(1, "PTSOpenClient: Unable to open %s\n", DEV_PTMX, 0,0 );
>!         return(-1);
>      }
> 
>      (void) grantpt(fd);
>      (void) unlockpt(fd);
> 
>      slave = ptsname(fd); /* get name */
>***************
>*** 2445,2472 ****
>
>  static int
>  TRANS(LocalClose)(XtransConnInfo ciptr)
>
>  {
>      struct sockaddr_un      *sockname=(struct sockaddr_un *) ciptr->addr;
>-     char    path[200]; /* > sizeof sun_path +1 */
>      int       ret;
>
>      PRMSG(2,"LocalClose(%x->%d)\n", ciptr, ciptr->fd ,0);
>
>      ret=close(ciptr->fd);
>
>      if(ciptr->flags
>         && sockname
>         && sockname->sun_family == AF_UNIX
>         && sockname->sun_path[0] )
>      {
>-       strncpy(path,sockname->sun_path,
>-               ciptr->addrlen-sizeof(sockname->sun_family));
>        if (!(ciptr->flags & TRANS_NOUNLINK))
>!           unlink(path);
>      }
>
>      return ret;
>  }
>
>  static int
>--- 2450,2474 ----
>
>  static int
>  TRANS(LocalClose)(XtransConnInfo ciptr)
>
>  {
>      struct sockaddr_un      *sockname=(struct sockaddr_un *) ciptr->addr;
>      int       ret;
>
>      PRMSG(2,"LocalClose(%x->%d)\n", ciptr, ciptr->fd ,0);
>
>      ret=close(ciptr->fd);
>
>      if(ciptr->flags
>         && sockname
>         && sockname->sun_family == AF_UNIX
>         && sockname->sun_path[0] )
>      {
>        if (!(ciptr->flags & TRANS_NOUNLINK))
>!           unlink(sockname->sun_path);
>      }
>
>      return ret;
>  }
>
>  static int

Actions: View | Splinter Review

Attachments on bug 3957: 2924 | 2925

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.