Attachment 702506 Details for Bug 914683 – patch to sysdeps/unix/sysv/linux/xstatconv.c

[patch] patch to sysdeps/unix/sysv/linux/xstatconv.c

diffs.out (text/plain), 1.52 KB, created by John Reiser on 2013-02-25 19:59:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Reiser

Created: 2013-02-25 19:59:37 UTC

Size: 1.52 KB

patch

obsolete

>--- ./sysdeps/unix/sysv/linux/xstatconv.c.old	2013-02-25 11:50:11.174343923 -0800
>+++ ./sysdeps/unix/sysv/linux/xstatconv.c	2013-02-25 11:53:50.618585135 -0800
>@@ -183,6 +183,7 @@
> int
> __xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
> {
>+  int rv = 0;
>   switch (vers)
>     {
>     case _STAT_VER_LINUX:
>@@ -204,8 +205,7 @@
> 	    if (sizeof (buf->st_ino) != sizeof (kbuf->st_ino)
> 		&& buf->st_ino != kbuf->st_ino)
> 	      {
>-		__set_errno (EOVERFLOW);
>-		return -1;
>+		rv = EOVERFLOW;
> 	      }
> 	  }
> #else
>@@ -213,8 +213,7 @@
> 	if (sizeof (buf->st_ino) != sizeof (kbuf->st_ino)
> 	    && buf->st_ino != kbuf->st_ino)
> 	  {
>-	    __set_errno (EOVERFLOW);
>-	    return -1;
>+	    rv = EOVERFLOW;
> 	  }
> #endif
> 	buf->st_mode = kbuf->st_mode;
>@@ -230,8 +229,7 @@
> 	if (sizeof (buf->st_size) != sizeof (kbuf->st_size)
> 	    && buf->st_size != kbuf->st_size)
> 	  {
>-	    __set_errno (EOVERFLOW);
>-	    return -1;
>+	    rv = EOVERFLOW;
> 	  }
> 	buf->st_blksize = kbuf->st_blksize;
> 	buf->st_blocks = kbuf->st_blocks;
>@@ -239,8 +237,7 @@
> 	if (sizeof (buf->st_blocks) != sizeof (kbuf->st_blocks)
> 	    && buf->st_blocks != kbuf->st_blocks)
> 	  {
>-	    __set_errno (EOVERFLOW);
>-	    return -1;
>+	    rv = EOVERFLOW;
> 	  }
> #ifdef _HAVE_STAT_NSEC
> 	buf->st_atim.tv_sec = kbuf->st_atim.tv_sec;
>@@ -277,10 +274,13 @@
> 	 _STAT_VER_KERNEL does not make sense.  */
>     case _STAT_VER_KERNEL:
>     default:
>-      __set_errno (EINVAL);
>-      return -1;
>+      rv = EINVAL;
>     }
> 
>+  if (rv) {
>+    __set_errno (rv);
>+    return -1;
>+  }
>   return 0;
> }
>

Actions: View | Diff

Attachments on bug 914683: 702506