- updated to 0.6.5

Changed files:
    gnokii-gcc4.patch -> 1.2

diff --git a/gnokii-gcc4.patch b/gnokii-gcc4.patch
index 19e9073c5c48db2010bcd7c5a757dab32eaacdca..e814dfeedb05bd4bab80ad9fd788213eabe7532b 100644 (file)
--- a/gnokii-gcc4.patch
+++ b/gnokii-gcc4.patch
@@ -1,19 +1,19 @@
-diff -Nru gnokii-0.6.4.orig/common/cfgreader.c gnokii-0.6.4/common/cfgreader.c
---- gnokii-0.6.4.orig/common/cfgreader.c       2004-10-17 21:44:20.000000000 +0200
-+++ gnokii-0.6.4/common/cfgreader.c    2005-04-28 18:29:43.464741688 +0200
-@@ -450,7 +450,7 @@
+diff -burN gnokii-0.6.5.orig/common/cfgreader.c gnokii-0.6.5/common/cfgreader.c
+--- gnokii-0.6.5.orig/common/cfgreader.c       2005-05-01 22:41:32.576264944 +0200
++++ gnokii-0.6.5/common/cfgreader.c    2005-05-01 22:44:36.464309712 +0200
+@@ -554,7 +554,7 @@
  
        retval = gn_cfg_read_default();
  
 -      (char *)*bindir = gn_cfg_get(gn_cfg_info, "global", "bindir");
 +      *bindir = gn_cfg_get(gn_cfg_info, "global", "bindir");
-       if (!*bindir) *bindir = gn_cfg_get(gn_cfg_info, "gnokiid", "bindir");
-       if (!*bindir) *bindir = "/usr/local/sbin";
- 
-iff -Nru gnokii-0.6.4.orig/common/links/atbus.c gnokii-0.6.4/common/links/atbus.c
---- gnokii-0.6.4.orig/common/links/atbus.c     2004-10-17 21:44:21.000000000 +0200
-+++ gnokii-0.6.4/common/links/atbus.c  2005-04-28 18:24:02.840524440 +0200
-@@ -258,7 +258,7 @@
+       if (!*bindir)
+               *bindir = gn_cfg_get(gn_cfg_info, "gnokiid", "bindir");
+       if (!*bindir)
+diff -burN gnokii-0.6.5.orig/common/links/atbus.c gnokii-0.6.5/common/links/atbus.c
+--- gnokii-0.6.5.orig/common/links/atbus.c     2005-05-01 22:41:32.605260536 +0200
++++ gnokii-0.6.5/common/links/atbus.c  2005-05-01 22:41:57.773434392 +0200
+@@ -262,7 +262,7 @@
        state->link.send_message = &at_send_message;
        businst->rbuf_pos = 1;
        businst->binlen = 1;
@@ -22,7 +22,7 @@ iff -Nru gnokii-0.6.4.orig/common/links/atbus.c gnokii-0.6.4/common/links/atbus.
  
        switch (state->config.connection_type) {
        case GN_CT_Serial:
-@@ -286,7 +286,7 @@
+@@ -290,7 +290,7 @@
  err:
        dprintf("AT bus initialization failed (%d)\n", error);
        free(AT_BUSINST(state));
@@ -31,10 +31,10 @@ iff -Nru gnokii-0.6.4.orig/common/links/atbus.c gnokii-0.6.4/common/links/atbus.
  out:
        return error;
  }
-diff -Nru gnokii-0.6.4.orig/common/links/fbus-3110.c gnokii-0.6.4/common/links/fbus-3110.c
---- gnokii-0.6.4.orig/common/links/fbus-3110.c 2004-10-17 21:44:21.000000000 +0200
-+++ gnokii-0.6.4/common/links/fbus-3110.c      2005-04-28 18:26:36.984091056 +0200
-@@ -351,7 +351,7 @@
+diff -burN gnokii-0.6.5.orig/common/links/fbus-3110.c gnokii-0.6.5/common/links/fbus-3110.c
+--- gnokii-0.6.5.orig/common/links/fbus-3110.c 2005-05-01 22:41:32.604260688 +0200
++++ gnokii-0.6.5/common/links/fbus-3110.c      2005-05-01 22:41:57.775434088 +0200
+@@ -355,7 +355,7 @@
                state->config.init_length = 100;
  
        /* Start up the link */
@@ -43,7 +43,7 @@ diff -Nru gnokii-0.6.4.orig/common/links/fbus-3110.c gnokii-0.6.4/common/links/f
                return GN_ERR_MEMORYFULL;
  
        FBUSINST(state)->request_sequence_number = 0x10;
-@@ -364,7 +364,7 @@
+@@ -368,7 +368,7 @@
  
        if (!fb3110_serial_open(state)) {
                free(FBUSINST(state));
@@ -52,51 +52,51 @@ diff -Nru gnokii-0.6.4.orig/common/links/fbus-3110.c gnokii-0.6.4/common/links/f
                return GN_ERR_FAILED;
        }
  
-diff -Nru gnokii-0.6.4.orig/common/links/fbus.c gnokii-0.6.4/common/links/fbus.c
---- gnokii-0.6.4.orig/common/links/fbus.c      2004-10-17 21:44:21.000000000 +0200
-+++ gnokii-0.6.4/common/links/fbus.c   2005-04-28 18:25:10.309267632 +0200
-@@ -623,7 +623,7 @@
-               state->config.init_length = 250;
+diff -burN gnokii-0.6.5.orig/common/links/fbus-phonet.c gnokii-0.6.5/common/links/fbus-phonet.c
+--- gnokii-0.6.5.orig/common/links/fbus-phonet.c       2005-05-01 22:41:32.605260536 +0200
++++ gnokii-0.6.5/common/links/fbus-phonet.c    2005-05-01 22:41:57.778433632 +0200
+@@ -296,7 +296,7 @@
+       state->link.loop = &phonet_loop;
+       state->link.send_message = &phonet_send_message;
  
-       /* Start up the link */
--      if ((FBUSINST(state) = calloc(1, sizeof(fbus_link))) == NULL)
-+      if (((void *)FBUSINST(state) = calloc(1, sizeof(fbus_link))) == NULL)
+-      if ((FBUSINST(state) = calloc(1, sizeof(phonet_incoming_message))) == NULL)
++      if (((void *)FBUSINST(state) = calloc(1, sizeof(phonet_incoming_message))) == NULL)
                return GN_ERR_MEMORYFULL;
  
-       FBUSINST(state)->request_sequence_number = 0;
-@@ -672,7 +672,7 @@
+       switch (state->config.connection_type) {
+@@ -312,7 +312,7 @@
        }
-       if (!connection) {
+       if (error != GN_ERR_NONE) {
                free(FBUSINST(state));
 -              FBUSINST(state) = NULL;
 +              (void *)FBUSINST(state) = NULL;
-               return GN_ERR_FAILED;
+               return error;
        }
  
-diff -Nru gnokii-0.6.4.orig/common/links/fbus-phonet.c gnokii-0.6.4/common/links/fbus-phonet.c
---- gnokii-0.6.4.orig/common/links/fbus-phonet.c       2004-10-17 21:44:21.000000000 +0200
-+++ gnokii-0.6.4/common/links/fbus-phonet.c    2005-04-28 18:26:01.852431880 +0200
-@@ -286,7 +286,7 @@
-       state->link.loop = &phonet_loop;
-       state->link.send_message = &phonet_send_message;
+diff -burN gnokii-0.6.5.orig/common/links/fbus.c gnokii-0.6.5/common/links/fbus.c
+--- gnokii-0.6.5.orig/common/links/fbus.c      2005-05-01 22:41:32.605260536 +0200
++++ gnokii-0.6.5/common/links/fbus.c   2005-05-01 22:41:57.777433784 +0200
+@@ -628,7 +628,7 @@
+               state->config.init_length = 250;
  
--      if ((FBUSINST(state) = calloc(1, sizeof(phonet_incoming_message))) == NULL)
-+      if (((void *)FBUSINST(state) = calloc(1, sizeof(phonet_incoming_message))) == NULL)
+       /* Start up the link */
+-      if ((FBUSINST(state) = calloc(1, sizeof(fbus_link))) == NULL)
++      if (((void *)FBUSINST(state) = calloc(1, sizeof(fbus_link))) == NULL)
                return GN_ERR_MEMORYFULL;
  
-       switch (state->config.connection_type) {
-@@ -301,7 +301,7 @@
+       FBUSINST(state)->request_sequence_number = 0;
+@@ -677,7 +677,7 @@
        }
-       if (error != GN_ERR_NONE) {
+       if (!connection) {
                free(FBUSINST(state));
 -              FBUSINST(state) = NULL;
 +              (void *)FBUSINST(state) = NULL;
-               return error;
+               return GN_ERR_FAILED;
        }
  
-diff -Nru gnokii-0.6.4.orig/common/links/gnbus.c gnokii-0.6.4/common/links/gnbus.c
---- gnokii-0.6.4.orig/common/links/gnbus.c     2004-10-17 21:44:21.000000000 +0200
-+++ gnokii-0.6.4/common/links/gnbus.c  2005-04-28 18:28:01.787199024 +0200
+diff -burN gnokii-0.6.5.orig/common/links/gnbus.c gnokii-0.6.5/common/links/gnbus.c
+--- gnokii-0.6.5.orig/common/links/gnbus.c     2005-05-01 22:41:32.605260536 +0200
++++ gnokii-0.6.5/common/links/gnbus.c  2005-05-01 22:41:57.779433480 +0200
 @@ -284,7 +284,7 @@
        state->link.send_message = gnbus_send_message;
  
@@ -115,10 +115,10 @@ diff -Nru gnokii-0.6.4.orig/common/links/gnbus.c gnokii-0.6.4/common/links/gnbus
                return GN_ERR_FAILED;
        }
  
-diff -Nru gnokii-0.6.4.orig/common/links/m2bus.c gnokii-0.6.4/common/links/m2bus.c
---- gnokii-0.6.4.orig/common/links/m2bus.c     2004-10-17 21:44:21.000000000 +0200
-+++ gnokii-0.6.4/common/links/m2bus.c  2005-04-28 18:27:16.001159560 +0200
-@@ -460,7 +460,7 @@
+diff -burN gnokii-0.6.5.orig/common/links/m2bus.c gnokii-0.6.5/common/links/m2bus.c
+--- gnokii-0.6.5.orig/common/links/m2bus.c     2005-05-01 22:41:32.605260536 +0200
++++ gnokii-0.6.5/common/links/m2bus.c  2005-05-01 22:41:57.780433328 +0200
+@@ -461,7 +461,7 @@
        state->link.send_message = m2bus_send_message;
  
        /* Start up the link */
@@ -127,7 +127,7 @@ diff -Nru gnokii-0.6.4.orig/common/links/m2bus.c gnokii-0.6.4/common/links/m2bus
                return GN_ERR_MEMORYFULL;
  
        M2BUSINST(state)->request_sequence_number = 2;
-@@ -473,7 +473,7 @@
+@@ -474,7 +474,7 @@
        }
        if (err != GN_ERR_NONE) {
                free(M2BUSINST(state));
@@ -136,10 +136,10 @@ diff -Nru gnokii-0.6.4.orig/common/links/m2bus.c gnokii-0.6.4/common/links/m2bus
                return err;
        }
  
-diff -Nru gnokii-0.6.4.orig/common/phones/atgen.c gnokii-0.6.4/common/phones/atgen.c
---- gnokii-0.6.4.orig/common/phones/atgen.c    2004-10-17 21:44:21.000000000 +0200
-+++ gnokii-0.6.4/common/phones/atgen.c 2005-04-28 18:21:12.280453512 +0200
-@@ -1645,7 +1645,7 @@
+diff -burN gnokii-0.6.5.orig/common/phones/atgen.c gnokii-0.6.5/common/phones/atgen.c
+--- gnokii-0.6.5.orig/common/phones/atgen.c    2005-05-01 22:41:32.614259168 +0200
++++ gnokii-0.6.5/common/phones/atgen.c 2005-05-01 22:41:57.782433024 +0200
+@@ -1683,7 +1683,7 @@
                return GN_ERR_MEMORYFULL;
  
        state->driver.incoming_functions = drvinst->incoming_functions;
@@ -148,7 +148,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/atgen.c gnokii-0.6.4/common/phones/atg
        drvinst->manufacturer_error = NULL;
        drvinst->memorytype = GN_MT_XX;
        drvinst->memoryoffset = 0;
-@@ -1720,7 +1720,7 @@
+@@ -1758,7 +1758,7 @@
        if (ret) {
                dprintf("Initialization failed (%d)\n", ret);
                free(AT_DRVINST(state));
@@ -157,7 +157,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/atgen.c gnokii-0.6.4/common/phones/atg
        }
        return ret;
  }
-@@ -1729,7 +1729,7 @@
+@@ -1767,7 +1767,7 @@
  {
        if (AT_DRVINST(state)) {
                free(AT_DRVINST(state));
@@ -166,10 +166,10 @@ diff -Nru gnokii-0.6.4.orig/common/phones/atgen.c gnokii-0.6.4/common/phones/atg
        }
        return pgen_terminate(data, state);
  }
-diff -Nru gnokii-0.6.4.orig/common/phones/gnapplet.c gnokii-0.6.4/common/phones/gnapplet.c
---- gnokii-0.6.4.orig/common/phones/gnapplet.c 2004-10-17 21:44:21.000000000 +0200
-+++ gnokii-0.6.4/common/phones/gnapplet.c      2005-04-28 18:22:56.226651288 +0200
-@@ -419,7 +419,7 @@
+diff -burN gnokii-0.6.5.orig/common/phones/gnapplet.c gnokii-0.6.5/common/phones/gnapplet.c
+--- gnokii-0.6.5.orig/common/phones/gnapplet.c 2005-05-01 22:41:32.613259320 +0200
++++ gnokii-0.6.5/common/phones/gnapplet.c      2005-05-01 22:41:57.785432568 +0200
+@@ -423,7 +423,7 @@
                if (DRVINSTANCE(state)) return GN_ERR_INTERNALERROR;
                return gnapplet_initialise(state);
        case GN_OP_Terminate:
@@ -178,7 +178,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/gnapplet.c gnokii-0.6.4/common/phones/
                return pgen_terminate(data, state);
        case GN_OP_GetImei:
        case GN_OP_GetModel:
-@@ -508,7 +508,7 @@
+@@ -516,7 +516,7 @@
        /* Copy in the phone info */
        memcpy(&(state->driver), &driver_gnapplet, sizeof(gn_driver));
  
@@ -187,7 +187,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/gnapplet.c gnokii-0.6.4/common/phones/
                return GN_ERR_MEMORYFULL;
  
        switch (state->config.connection_type) {
-@@ -520,13 +520,13 @@
+@@ -528,13 +528,13 @@
                err = gnbus_initialise(state);
                break;
        default:
@@ -203,7 +203,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/gnapplet.c gnokii-0.6.4/common/phones/
                return GN_ERR_NOTSUPPORTED;
        }
  
-@@ -534,7 +534,7 @@
+@@ -542,7 +542,7 @@
  
        gn_data_clear(&d);
        if ((err = gnapplet_identify(&d, state)) != GN_ERR_NONE) {
@@ -212,10 +212,10 @@ diff -Nru gnokii-0.6.4.orig/common/phones/gnapplet.c gnokii-0.6.4/common/phones/
                return err;
        }
  
-diff -Nru gnokii-0.6.4.orig/common/phones/nk3110.c gnokii-0.6.4/common/phones/nk3110.c
---- gnokii-0.6.4.orig/common/phones/nk3110.c   2004-10-17 21:44:21.000000000 +0200
-+++ gnokii-0.6.4/common/phones/nk3110.c        2005-04-28 18:19:17.935836536 +0200
-@@ -169,7 +169,7 @@
+diff -burN gnokii-0.6.5.orig/common/phones/nk3110.c gnokii-0.6.5/common/phones/nk3110.c
+--- gnokii-0.6.5.orig/common/phones/nk3110.c   2005-05-01 22:41:32.612259472 +0200
++++ gnokii-0.6.5/common/phones/nk3110.c        2005-05-01 22:41:57.786432416 +0200
+@@ -171,7 +171,7 @@
                if (DRVINSTANCE(state)) return GN_ERR_INTERNALERROR;
                return P3110_Initialise(state);
        case GN_OP_Terminate:
@@ -224,7 +224,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk3110.c gnokii-0.6.4/common/phones/nk
                return pgen_terminate(data, state);
        case GN_OP_GetModel:
        case GN_OP_GetRevision:
-@@ -226,7 +226,7 @@
+@@ -228,7 +228,7 @@
        /* Copy in the phone info */
        memcpy(&(state->driver), &driver_nokia_3110, sizeof(gn_driver));
  
@@ -233,7 +233,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk3110.c gnokii-0.6.4/common/phones/nk
                error = GN_ERR_MEMORYFULL;
                goto retval;
        }
-@@ -268,7 +268,7 @@
+@@ -270,7 +270,7 @@
  
        goto retval;
  errcond:
@@ -242,10 +242,10 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk3110.c gnokii-0.6.4/common/phones/nk
  retval:
        return error;
  }
-diff -Nru gnokii-0.6.4.orig/common/phones/nk6100.c gnokii-0.6.4/common/phones/nk6100.c
---- gnokii-0.6.4.orig/common/phones/nk6100.c   2004-10-17 21:44:21.000000000 +0200
-+++ gnokii-0.6.4/common/phones/nk6100.c        2005-04-28 18:17:38.371972544 +0200
-@@ -238,7 +238,7 @@
+diff -burN gnokii-0.6.5.orig/common/phones/nk6100.c gnokii-0.6.5/common/phones/nk6100.c
+--- gnokii-0.6.5.orig/common/phones/nk6100.c   2005-05-01 22:41:32.613259320 +0200
++++ gnokii-0.6.5/common/phones/nk6100.c        2005-05-01 22:41:57.790431808 +0200
+@@ -239,7 +239,7 @@
                if (DRVINSTANCE(state)) return GN_ERR_INTERNALERROR;
                return Initialise(state);
        case GN_OP_Terminate:
@@ -254,7 +254,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk6100.c gnokii-0.6.4/common/phones/nk
                return pgen_terminate(data, state);
        case GN_OP_GetSpeedDial:
                return GetSpeedDial(data, state);
-@@ -522,7 +522,7 @@
+@@ -523,7 +523,7 @@
        /* Copy in the phone info */
        memcpy(&(state->driver), &driver_nokia_6100, sizeof(gn_driver));
  
@@ -263,7 +263,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk6100.c gnokii-0.6.4/common/phones/nk
                return GN_ERR_MEMORYFULL;
  
        switch (state->config.connection_type) {
-@@ -541,13 +541,13 @@
+@@ -542,13 +542,13 @@
                err = m2bus_initialise(state);
                break;
        default:
@@ -279,7 +279,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk6100.c gnokii-0.6.4/common/phones/nk
                return GN_ERR_NOTSUPPORTED;
        }
  
-@@ -557,7 +557,7 @@
+@@ -558,7 +558,7 @@
           authorize or set keytable */
  
        if ((err = IdentifyPhone(state)) != GN_ERR_NONE) {
@@ -288,7 +288,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk6100.c gnokii-0.6.4/common/phones/nk
                return err;
        }
  
-@@ -567,7 +567,7 @@
+@@ -568,7 +568,7 @@
        if (DRVINSTANCE(state)->pm->flags & PM_AUTHENTICATION) {
                /* Now test the link and authenticate ourself */
                if ((err = Authentication(state, DRVINSTANCE(state)->imei)) != GN_ERR_NONE) {
@@ -297,7 +297,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk6100.c gnokii-0.6.4/common/phones/nk
                        return err;
                }
        }
-@@ -577,7 +577,7 @@
+@@ -578,7 +578,7 @@
                        /* FIXME: build a default table */
                } else {
                        if (BuildKeytable(state) != GN_ERR_NONE) {
@@ -306,9 +306,9 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk6100.c gnokii-0.6.4/common/phones/nk
                                return GN_ERR_NOTSUPPORTED;
                        }
                }
-diff -Nru gnokii-0.6.4.orig/common/phones/nk6160.c gnokii-0.6.4/common/phones/nk6160.c
---- gnokii-0.6.4.orig/common/phones/nk6160.c   2004-10-17 21:44:21.000000000 +0200
-+++ gnokii-0.6.4/common/phones/nk6160.c        2005-04-28 18:14:41.534855872 +0200
+diff -burN gnokii-0.6.5.orig/common/phones/nk6160.c gnokii-0.6.5/common/phones/nk6160.c
+--- gnokii-0.6.5.orig/common/phones/nk6160.c   2005-05-01 22:41:32.613259320 +0200
++++ gnokii-0.6.5/common/phones/nk6160.c        2005-05-01 22:41:57.791431656 +0200
 @@ -189,7 +189,7 @@
        if (error) {
                dprintf("Initialization failed (%d)\n", error);
@@ -318,10 +318,10 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk6160.c gnokii-0.6.4/common/phones/nk
        }
        return error;
  }
-diff -Nru gnokii-0.6.4.orig/common/phones/nk7110.c gnokii-0.6.4/common/phones/nk7110.c
---- gnokii-0.6.4.orig/common/phones/nk7110.c   2004-10-17 21:44:21.000000000 +0200
-+++ gnokii-0.6.4/common/phones/nk7110.c        2005-04-28 18:13:52.087373032 +0200
-@@ -184,7 +184,7 @@
+diff -burN gnokii-0.6.5.orig/common/phones/nk7110.c gnokii-0.6.5/common/phones/nk7110.c
+--- gnokii-0.6.5.orig/common/phones/nk7110.c   2005-05-01 22:41:32.614259168 +0200
++++ gnokii-0.6.5/common/phones/nk7110.c        2005-05-01 22:41:57.793431352 +0200
+@@ -199,7 +199,7 @@
        case GN_OP_Init:
                return NK7110_Initialise(state);
        case GN_OP_Terminate:
@@ -330,7 +330,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk7110.c gnokii-0.6.4/common/phones/nk
                return pgen_terminate(data, state);
        case GN_OP_GetModel:
                return NK7110_GetModel(data, state);
-@@ -322,7 +322,7 @@
+@@ -343,7 +343,7 @@
        /* Copy in the phone info */
        memcpy(&(state->driver), &driver_nokia_7110, sizeof(gn_driver));
  
@@ -339,7 +339,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk7110.c gnokii-0.6.4/common/phones/nk
                return GN_ERR_INTERNALERROR;
  
        dprintf("Connecting\n");
-@@ -350,7 +350,7 @@
+@@ -371,7 +371,7 @@
                        err = m2bus_initialise(state);
                        break;
                default:
@@ -348,7 +348,7 @@ diff -Nru gnokii-0.6.4.orig/common/phones/nk7110.c gnokii-0.6.4/common/phones/nk
                        return GN_ERR_NOTSUPPORTED;
                }
  
-@@ -368,7 +368,7 @@
+@@ -389,7 +389,7 @@
                        connected = true;
        }
        if (!connected) {