[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27495 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27495 - gnunet/src/util |
Date: |
Wed, 19 Jun 2013 18:09:59 +0200 |
Author: amatus
Date: 2013-06-19 18:09:59 +0200 (Wed, 19 Jun 2013)
New Revision: 27495
Modified:
gnunet/src/util/disk.c
Log:
Fix windows build, statfs is broken there.
Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c 2013-06-19 13:35:50 UTC (rev 27494)
+++ gnunet/src/util/disk.c 2013-06-19 16:09:59 UTC (rev 27495)
@@ -328,6 +328,26 @@
GNUNET_DISK_file_get_identifiers (const char *filename, uint64_t * dev,
uint64_t * ino)
{
+#if WINDOWS
+ {
+ // FIXME NILS: test this
+ struct GNUNET_DISK_FileHandle *fh;
+ BY_HANDLE_FILE_INFORMATION info;
+ int succ;
+
+ fh = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ, 0);
+ if (fh == NULL)
+ return GNUNET_SYSERR;
+ succ = GetFileInformationByHandle (fh->h, &info);
+ GNUNET_DISK_file_close (fh);
+ if (!succ)
+ {
+ return GNUNET_SYSERR;
+ }
+ *dev = info.dwVolumeSerialNumber;
+ *ino = ((((uint64_t) info.nFileIndexHigh) << (sizeof (DWORD) * 8)) |
info.nFileIndexLow);
+ }
+#else /* !WINDOWS */
#if HAVE_STAT
{
struct stat sbuf;
@@ -362,28 +382,10 @@
*dev = ((uint64_t) fbuf.f_fsid.val[0]) << 32 ||
((uint64_t) fbuf.f_fsid.val[1]);
}
-#elif WINDOWS
- {
- // FIXME NILS: test this
- struct GNUNET_DISK_FileHandle *fh;
- BY_HANDLE_FILE_INFORMATION info;
- int succ;
-
- fh = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ, 0);
- if (fh == NULL)
- return GNUNET_SYSERR;
- succ = GetFileInformationByHandle (fh->h, &info);
- GNUNET_DISK_file_close (fh);
- if (!succ)
- {
- return GNUNET_SYSERR;
- }
- *dev = info.dwVolumeSerialNumber;
- *ino = ((((uint64_t) info.nFileIndexHigh) << (sizeof (DWORD) * 8)) |
info.nFileIndexLow);
- }
#else
*dev = 0;
#endif
+#endif /* !WINDOWS */
return GNUNET_OK;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27495 - gnunet/src/util,
gnunet <=