[BACK]Return to pthread_cancelstub.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / lib / libpthread

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/lib/libpthread/pthread_cancelstub.c between version 1.28.2.1 and 1.29

version 1.28.2.1, 2011/02/08 16:19:01 version 1.29, 2011/01/25 19:13:26
Line 50  __RCSID("$NetBSD$");
Line 50  __RCSID("$NetBSD$");
  */   */
 #define __LIBC12_SOURCE__  #define __LIBC12_SOURCE__
   
 #define __ssp_weak_name(fun)    _cancelstub_ ## fun  
   
 #include <sys/msg.h>  #include <sys/msg.h>
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/uio.h>  #include <sys/uio.h>
Line 61  __RCSID("$NetBSD$");
Line 59  __RCSID("$NetBSD$");
 #include <mqueue.h>  #include <mqueue.h>
 #include <poll.h>  #include <poll.h>
 #include <stdarg.h>  #include <stdarg.h>
   
   #define read _read
 #include <unistd.h>  #include <unistd.h>
   #undef read
   ssize_t  read(int, void *, size_t);
   
   
 #include <signal.h>  #include <signal.h>
 #include <sys/mman.h>  #include <sys/mman.h>
Line 470  pwrite(int d, const void *buf, size_t nb
Line 473  pwrite(int d, const void *buf, size_t nb
         return retval;          return retval;
 }  }
   
 #if _FORTIFY_SOURCE > 0  
 #define STUB(fun) __ssp_weak_name(fun)  
 ssize_t _sys_readlink(const char * __restrict, char * __restrict, size_t);  
 ssize_t  ssize_t
 STUB(readlink)(const char * __restrict path, char * __restrict buf,  read(int d, void *buf, size_t nbytes)
     size_t bufsiz)  
 {  
         return _sys_readlink(path, buf, bufsiz);  
 }  
   
 char *_sys_getcwd(char *, size_t);  
 char *  
 STUB(getcwd)(char *buf, size_t size)  
 {  
         return _sys_getcwd(buf, size);  
 }  
 #else  
 #define STUB(fun) fun  
 #endif  
   
 ssize_t  
 STUB(read)(int d, void *buf, size_t nbytes)  
 {  {
         ssize_t retval;          ssize_t retval;
         pthread_t self;          pthread_t self;
   
   #ifdef __ssp_check
           __ssp_check(buf, nbytes, __ssp_bos0);
   #endif
   
         self = pthread__self();          self = pthread__self();
         TESTCANCEL(self);          TESTCANCEL(self);
         retval = _sys_read(d, buf, nbytes);          retval = _sys_read(d, buf, nbytes);

Legend:
Removed from v.1.28.2.1  
changed lines
  Added in v.1.29

CVSweb <webmaster@jp.NetBSD.org>