From: Daniel Elstner <redacted>
Date: Wed, 16 Sep 2015 21:33:45 +0000 (+0200)
Subject: fx2lafw, sysclk-lwla: Avoid g_stat()
X-Git-Tag: libsigrok-0.4.0~285
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=2a09aac26862e8b8c88baa74634f6cb8f62352fc;hp=eb2373f1674706bd050c9b7c00927e42b70ea0f2;p=libsigrok.git

fx2lafw, sysclk-lwla: Avoid g_stat()

It turns out that g_stat() breaks apart when using 64 bit stat on
32-bit systems. Since the actual type of GStatBuf is decided when
glib/gstdio.h is included, it is thus possible for GLib itself to
be compiled with a different type than user code.

Ouch. Unfortunately going back to plain stat() also means that we
lose Unicode filename support on Windows.
---

diff --git a/src/hardware/fx2lafw/dslogic.c b/src/hardware/fx2lafw/dslogic.c
index 84d210b3..7363faac 100644
--- a/src/hardware/fx2lafw/dslogic.c
+++ b/src/hardware/fx2lafw/dslogic.c
@@ -39,7 +39,7 @@ int dslogic_fpga_firmware_upload(const struct sr_dev_inst *sdi,
 		const char *filename)
 {
 	FILE *fw;
-	GStatBuf st;
+	struct stat st;
 	struct sr_usb_dev_inst *usb;
 	int chunksize, result, ret;
 	unsigned char *buf;
@@ -49,7 +49,7 @@ int dslogic_fpga_firmware_upload(const struct sr_dev_inst *sdi,
 	sr_dbg("Uploading FPGA firmware at %s.", filename);
 
 	usb = sdi->conn;
-	if (g_stat(filename, &st) < 0) {
+	if (stat(filename, &st) < 0) {
 		sr_err("Unable to upload FPGA firmware: %s", g_strerror(errno));
 		return SR_ERR;
 	}
diff --git a/src/hardware/sysclk-lwla/lwla.c b/src/hardware/sysclk-lwla/lwla.c
index 39dccbd2..ab9fece8 100644
--- a/src/hardware/sysclk-lwla/lwla.c
+++ b/src/hardware/sysclk-lwla/lwla.c
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <errno.h>
+#include <sys/stat.h>
 #include <glib/gstdio.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
@@ -33,13 +34,13 @@
  */
 static unsigned char *load_bitstream_file(const char *filename, int *length_p)
 {
-	GStatBuf statbuf;
+	struct stat statbuf;
 	FILE *file;
 	unsigned char *stream;
 	size_t length, count;
 
 	/* Retrieve and validate the file size. */
-	if (g_stat(filename, &statbuf) < 0) {
+	if (stat(filename, &statbuf) < 0) {
 		sr_err("Failed to access bitstream file: %s.",
 		       g_strerror(errno));
 		return NULL;