[pdf-devel] Patch for FS#114

[gerel]

Hi pdf-fanatics,

I wrote a patch for FS#114. The test 'pdf_stm_bseek_003' which was failing,
now passes with this patch.

##
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/gerel/PROJECTS/libgnupdf/trunk/
# testament_sha1: 396d26c06b935e28a2684ce4dfbaf40944b1604e
# timestamp: 2010-04-17 17:27:43 -0300
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog   2010-04-15 15:58:08 +0000
+++ ChangeLog   2010-04-17 20:27:36 +0000
@@ -1,3 +1,8 @@
+2010-04-17  Gerardo E. Gidoni  <address@hidden>
+
+       Updated pdf_fsys_disk_file_set/get_pos to use fseek/ftell
+       * src/base/pdf-fsys-disk.c: changed fgetpos/fsetpos for ftell/fseek.
+
 2010-04-15  Jose E. Marchesi  <address@hidden>
 
        Remove spurious blank lines before EOF in the codebase.

=== modified file 'src/base/pdf-fsys-disk.c'
--- src/base/pdf-fsys-disk.c    2010-04-15 15:07:50 +0000
+++ src/base/pdf-fsys-disk.c    2010-04-17 20:27:36 +0000
@@ -1012,10 +1012,14 @@
   if((file != NULL) && \
      (pos != NULL))
     {
-      return ((fgetpos(((pdf_fsys_disk_file_t)file->data)->file_descriptor, \
-                       (fpos_t*)pos) == 0) ?                            \
-              PDF_OK :                                                  \
-              __pdf_fsys_disk_get_status_from_errno(errno));
+      long cpos;
+      cpos = ftell(((pdf_fsys_disk_file_t)file->data)->file_descriptor);
+      if (cpos<0){
+        return __pdf_fsys_disk_get_status_from_errno(errno);        
+      }else{
+        *pos = cpos;
+        return PDF_OK;
+      }
     }
   else
     {
@@ -1029,10 +1033,14 @@
 {
   if(file != NULL)
     {
-      return ((fsetpos(((pdf_fsys_disk_file_t)file->data)->file_descriptor, \
-                       (fpos_t*)&new_pos) == 0) ?                       \
-              PDF_OK :                                                  \
-              __pdf_fsys_disk_get_status_from_errno(errno));
+      int st;
+      st = fseek(((pdf_fsys_disk_file_t)file->data)->file_descriptor,
+                 new_pos, SEEK_SET);
+      if (st < 0){
+        return __pdf_fsys_disk_get_status_from_errno(errno);
+      }else{
+        return PDF_OK;
+      }
     }
   else
     {

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ3ONiYAAmRfgBwyUHf//1+M
3gC////6UAUvUAAUlQABCUU0npqBqPSNmpNkjR6mEyaBoNMgZqGg5gTE0GEyZMmRhME00yMTAEMB
zAmJoMJkyZMjCYJppkYmAIYDmBMTQYTJkyZGEwTTTIxMAQwCSQCATJk0I0BMaUyaNT2kaRmpgxNG
iEgojTUuDhmYz+FPZ0ry+6DAjBU4F/lVJp3I6vNRgC5DoPH3Sc920EJwi1hf9p8bG4n5djDMDd/y
ot0LlJV4rkLKWKsES3GsHST7mLyQ0Rl5TFsya9hY+N9aEWqXEcw4ZevY4KjYZ7t7X9H/u7ixxNgO
YRwz9hxvGcNy+RutkZlx7OctIZHW/HcQOOhJDwOw1qkeRWd52bOg/fmBhr23Lo+GE3h8xHSaburK
RjbmZDTqEZN5O7XuEsUZMJOWrnvi9IdzUCjL3MZoUXRHuMjPeVyJDpTeq41hBXqLiy4TfieERKPO
SJanPrldGEbSlWB/F8bfgpeQf3XVNGTjsvcoAZlX3+FvAzzbA30s3cpl/G99Y6EppyPayFxebQGs
NlY5h45Vam3W6IFhfxCJXZMVDrW83kGhy0Lq5K8malpIGyAyyLa6qgtdbH/CxXbXC4PCstghaYDu
HTuzRPEyLDFQKvm4um2+mjn1Og43Mr5qtD3YvLyRQlCwqC5xa2yhmKjioqJkdz4V3AVs+6V7QLyE
cPsBOr6TkBt9TwtITYxyYMAxe8BgH9bylDcMaUPFPukGby9WnQaYZEuHdZBgKbjE2qoBiqJW7Kox
HmBka6ROisdnfstY1kcCrZpRYxKEZ2GLKzjCco1YvW0qhtfNyJvUnA0WiqInRvHzPL/457b3d44Z
lHgWtqoOcgYuaj1JxijxDOhacqgpndtI61VTYF+SsVDG/hOET8oOZ8q/hz/ohxoWHAXtPWDjmJx0
kehhYDz7T1iQEww4X3d3Pxb1c2/CgDz0rs/4j37Cb7wv2ofUl1jDGCxHazLoSDu5s2gsFfRGA8s7
06NRnRNKcdBaL538pbPAdLG0u4Ce2hR0vvW4bt25tca3phIwfBjJS00LMgW0B0UfwdxOjbPIgItZ
ejhni0qLQOr0JpgazCec0kZS2JrvKvhMpkHvxKQROBUFDL1DMcRS2MKcGOVgb/N2jXdTiIi0Lz+S
xEF9kwb5afWiRsgjqO87aHZt4lCoGa0OlMiNiJSJlDgef6nX1nZIXE7FUnnj8j9TmdRA3hrm9W3k
Rz/Ww3MgK8fAaOtOeow8R5wZDKMjzTDsRxYWfQRt4JcRfVyqs0F4Yo5HHIlpgjtdL2GCniJQNfRF
8+/djDNFZ4ItEZQPX0dnmq0b95MGHe5PFqjcVyYYPxIoe+/0AdoMCuFcwEuyC2tWxuYjhiPRmqGV
Y9LbKMVGIQK0y1JRQ/h9XvgDZ0CFgmYPuEOVN/Qcg9Cn+bTg8zrR98a4lliXwEOXN6YRjrpqwwfY
584HqO4fCaplX9HW0TOXL336GS6QK5p+RbyY5Jke53hATkhkvmFvfqrqhE8u28gviRRtDYGeJVl/
a9lA72s0GQU944GFaWbprGJE3EKBpgO7R6pA3oYYRYHbrV1+T3zKhWCJgW4HjIaY+Dx5oDDxwEFq
55QLvwRaGMc6XkTeWIuVw0mDJ4VDxDlfskYVKrAVhUqkek3TA6zRPDiA3xtUvaXCDZikSaR4f4u5
IpwoSAbnGxMA

###

-gerel