Re: [pdf-devel] Patch for FS#114

[gerel]

Ok. Here is try 2 :-)

##
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/gerel/PROJECTS/libgnupdf/trunk/
# testament_sha1: e23fd060d388ce397f3749dd265260573d26eafb
# timestamp: 2010-04-18 18:52:31 -0300
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog   2010-04-15 15:58:08 +0000
+++ ChangeLog   2010-04-18 21:52:09 +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-18 21:52:09 +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
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVZfoEEAAljfgBwyUHf//1+M
3gC////6UAUteW3Routps1DWghKJpDUaNGTRNqbFNMp5PTUgbUaGmaQaB6g1KeobSNqZ6SAGEANA
AAMhkAEkIJGRTxpR5TQG0QeoBjQhkyep6aQxzAmJoMJkyZMjCYJppkYmAIYBJITIAmJpk0Unmmim
TPJT1D1DJpoNGj1EYhOKhGeC25YmbmKcn56yvV02owqHNVTTZBJMGm3IC9I8oIuo8PegE4B+a5+v
8XmJ/OdOphmBuPstXo+Cmlc9L2qZVdItMbEM0/oyzvsmKlOzlw8uRhq/0Txf1HUcw4Ze7Y4KDYbd
+/S7h8eXDicZsAewjU6DAw1f7GVWwxKzp0jthYBedsMMiBvxIoeBIyoifWUnM6stR95tFuJOrvmy
MH7ENRS/dPGZZcxOLJgEJ97na3bWEsqPHe4lCZ3dO/uV/ByOhSkPMzmIumTHnSFQBSzqQgoFpB8K
KkFgm8jwkJS9cURzL/qtg+FYROJtRJ2mWvgeWCnpMGgAem8qWZkMZELgC6TSgTKJRyn55cYlV3jK
FBCWxOR4shb3pGBOBbfSQYmNo4ecbZoGlr7rBtQmIVRRjn2KAG8eTNX6rS6qaK1wJrxgxJOkY0+h
Cna7V4SnIIWO52WCN2pOXgUnBTNJaZgnvgx4Gre9IZEljTgMXZ65ZGQsKwUx1LNKmRSQMp4XNTXU
olhYQjb9IWmPN4d4Eq62C0HTDOZ5d4JqIg4ypUjgbTLTup3SxLc22JmLa4kt0QHGwzM9YSMYyt1H
bsYG/gUDK8DUe8vIEqFgMA8qXrRhAutek2qxmwmSWeKuisKrg02mrEVgvTcb/McNUuwcKqRZjEug
cuwVlvt8CsZSoQ7ULrGYGPjZtMc926jt2kzcRTeVlM55O0Uw7Nf8JcFhabxdToDj2CccSbgwrh56
SzmICYYcHVjlyPX0OHP44bh5i4ofCcyNMEtKDSontGLgWQ7n4xfWpx19ufpiTniTmdcx9pzb0Tvg
dUvxoY3TjwpNQL6JNaHMuMezHjairv3WcYbbb/nOfHNdpyDhvfkcyyQPwCskHaRRG01Fhdm9pIRi
ZczjQLRgPX0AbCqYGyH3Z3N8qZrLzgN0dijpIAqChe66Mix6pMUwbsi765a5Q0bncFstcRCE4UH5
JkHpzRQxx6f7BEKHoWm064GvN6icoBmrDgmRNUiMSROaYdw79TqawIieaEu1YEiN/meRcWDzSHRS
yX7CIc3sUW8eJMM8WKqF9Qw8RlBkMponVMOvHFRV/gjHRLgL/XKirIWl6PUa4PAaOVyOTpeJcpXi
UDsA080XT888IZIqPBFgjCB7uPL2qlGm9pAw72p4tEZlJFmD7iZD32ttGBVirYCbtgsGoYyYmt2D
0YqcvpHpMBhGc1KYSMKZeQpNEeX+xEga+wJWiZg1iHVnoNPEceRP6YmjzbSjpNTMVVJeYhy9j0wi
/PLNhg/4uuebTrGfIkKMP8digiuSzjNnKEwRo6clsUrT6AOQ7n+EwnJDJfQK+/Nd1AiWPdcQXvJk
bQvDLAox/tdZw72qyGQT+Y73AMnCsK851hMTGZCgN2wdzHqeBqhhhFQc9KOX2PfIoFUIruPZMNEf
B483Aw8gtIPJBZ5IqC+bbPYTG8qRYrBosGDwoHiHK3CJdQqLhVFCoR8JO3AcioDcoI99is3lojqB
PQkE7yoP+LuSKcKEgrL9Agg=

###

-gerel