# HG changeset patch
# User nenolod
# Date 1169437603 28800
# Node ID 218ef0b740ac542623afacff2640cd4d56b8a5aa
# Parent  631bd25d2380372e1266ce920e3494c706b4b106
[svn] - fix getc emulation

diff -r 631bd25d2380 -r 218ef0b740ac ChangeLog
--- a/ChangeLog	Sun Jan 21 19:36:36 2007 -0800
+++ b/ChangeLog	Sun Jan 21 19:46:43 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-22 03:36:36 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1074]
+  - getc/ungetc emulation
+  
+  trunk/src/curl/curl.c |   32 +++++++++++++++++++++++++++++---
+  1 file changed, 29 insertions(+), 3 deletions(-)
+
+
 2007-01-22 00:08:19 +0000  Giacomo Lozito <james@develia.org>
   revision [1072]
   flac 113 plugin: stability fixes and a new option to disable bitrate update in player window during playback (saves cpu, this is the solution for most people playing flac and reporting high cpu usage)
diff -r 631bd25d2380 -r 218ef0b740ac src/curl/curl.c
--- a/src/curl/curl.c	Sun Jan 21 19:36:36 2007 -0800
+++ b/src/curl/curl.c	Sun Jan 21 19:46:43 2007 -0800
@@ -595,7 +595,7 @@
 curl_vfs_getc_impl(VFSFile *stream)
 {
   CurlHandle *handle = (CurlHandle *) stream->handle;
-  gchar c;
+  guchar c;
 
   g_return_val_if_fail(handle != NULL, EOF);
 
@@ -607,10 +607,11 @@
     handle->charstack = g_slist_delete_link(handle->charstack, handle->charstack);
     return c;
   }
-  else if (curl_vfs_fread_impl(&c, 1, 1, stream) != 1)
-    return -1;
 
-  return c;
+  if (curl_vfs_fread_impl(&c, 1, 1, stream))
+    return c;
+
+  return EOF;
 }
 
 gint