[oe-commits] org.oe.dev merge of '8961e177cdb0b701e3bb0304ec24d5c4a3947254'
koen commit
openembedded-commits at lists.openembedded.org
Tue Jul 31 22:16:55 UTC 2007
merge of '8961e177cdb0b701e3bb0304ec24d5c4a3947254'
and 'e3756fffb6fe48cc7854ecab0ddfe07c21359f15'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 79771edb5b4d45a18e509f01db9c473d1aa63962
ViewMTN: http://monotone.openembedded.org/revision.psp?id=79771edb5b4d45a18e509f01db9c473d1aa63962
Files:
1
packages/gtkhtml2/gtkhtml2_cvs.bb
packages/gtkhtml2/gtkhtml2_svn.bb
packages/gaim/pidgin_2.1.0.bb
packages/e17/edje-editor_cvs.bb
packages/e17/edje-viewer_cvs.bb
packages/uboot/u-boot-mkimage-gta01-native_oe.bb
packages/gsm/files/mlbuf-static-bss.patch
packages/gsm/files/mlbuf-in-gsmd-struct.patch
classes/base.bbclass
conf/bitbake.conf
contrib/mtn2cl/mtn2cl.sh
packages/file/file-native_4.21.bb
packages/gsm/files/sms-hacks.patch
packages/gsm/libgsmd_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
Diffs:
#
# mt diff -r8961e177cdb0b701e3bb0304ec24d5c4a3947254 -r79771edb5b4d45a18e509f01db9c473d1aa63962
#
#
#
# rename "packages/gtkhtml2/gtkhtml2_cvs.bb"
# to "packages/gtkhtml2/gtkhtml2_svn.bb"
#
# add_file "packages/gaim/pidgin_2.1.0.bb"
# content [f38dd9af51ab37706164482bcece1477daca655a]
#
# patch "packages/e17/edje-editor_cvs.bb"
# from [740c05ae1ecafcda56ba3f18f5b2fe0dac6332be]
# to [cfa6ec43d5f9faae882abbe2efa486f7fa6523f3]
#
# patch "packages/e17/edje-viewer_cvs.bb"
# from [2a7237f77298295dcb9a891068279c010aea803f]
# to [a789e404a347e1eedc48636e834ce762cb837e4a]
#
# patch "packages/uboot/u-boot-mkimage-gta01-native_oe.bb"
# from [148eadcd4b31c1fc73879e61409c8db14331aaeb]
# to [d2ac07afa8091ccc0ab72e917cab17dad786d31e]
#
============================================================
--- packages/gaim/pidgin_2.1.0.bb f38dd9af51ab37706164482bcece1477daca655a
+++ packages/gaim/pidgin_2.1.0.bb f38dd9af51ab37706164482bcece1477daca655a
@@ -0,0 +1,9 @@
+require pidgin.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+ file://sanitize-configure.ac.patch;patch=1 \
+ file://gconf-no-errors.patch;patch=1 \
+ file://pidgin.desktop-set-icon.patch;patch=1 \
+ "
+
+PR = "r0"
============================================================
--- packages/e17/edje-editor_cvs.bb 740c05ae1ecafcda56ba3f18f5b2fe0dac6332be
+++ packages/e17/edje-editor_cvs.bb cfa6ec43d5f9faae882abbe2efa486f7fa6523f3
@@ -1,7 +1,7 @@ DEPENDS = "etk"
DESCRIPTION = "Edje-Editor is just that."
LICENSE = "MIT"
DEPENDS = "etk"
-PV = "0.0.0+svn${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
inherit e
============================================================
--- packages/e17/edje-viewer_cvs.bb 2a7237f77298295dcb9a891068279c010aea803f
+++ packages/e17/edje-viewer_cvs.bb a789e404a347e1eedc48636e834ce762cb837e4a
@@ -1,7 +1,7 @@ LICENSE = "MIT"
DESCRIPTION = "Edje_Viewer is just that."
DEPENDS = "etk"
LICENSE = "MIT"
-PV = "0.0.0+svn${SRCDATE}"
+PV = "0.0.0+cvs${SRCDATE}"
PR = "r0"
inherit e
============================================================
--- packages/uboot/u-boot-mkimage-gta01-native_oe.bb 148eadcd4b31c1fc73879e61409c8db14331aaeb
+++ packages/uboot/u-boot-mkimage-gta01-native_oe.bb d2ac07afa8091ccc0ab72e917cab17dad786d31e
@@ -5,7 +5,6 @@ file://ext2load_hex.patch;patch=1 \
SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=9912121f7ed804ea58fd62f3f230b5dcfc357d88 \
file://uboot-machtypes.patch;patch=1 \
file://ext2load_hex.patch;patch=1 \
-file://uboot-mokoversion.patch;patch=1 \
file://uboot-s3c2410-warnings-fix.patch;patch=1 \
file://uboot-strtoul.patch;patch=1 \
file://uboot-cramfs_but_no_jffs2.patch;patch=1 \
#
# mt diff -re3756fffb6fe48cc7854ecab0ddfe07c21359f15 -r79771edb5b4d45a18e509f01db9c473d1aa63962
#
#
#
# delete "packages/gsm/files/mlbuf-static-bss.patch"
#
# add_file "packages/gsm/files/mlbuf-in-gsmd-struct.patch"
# content [c792becbe959d694d9e19d4b3f5fe7d77d46de94]
#
# patch "classes/base.bbclass"
# from [8ae82b899b740b9da403e698610bf6ca49f8e64c]
# to [26453f8831d23d5ae6400f403116c9272347807d]
#
# patch "conf/bitbake.conf"
# from [ee130e54dc68eb5516e965696fbced464a542166]
# to [d7da259bfd8ea8f8052f4258ba7b9c6e58a864ef]
#
# patch "contrib/mtn2cl/mtn2cl.sh"
# from [89788c2d8ed63aa5ab3469b7c152d93de8ec1af6]
# to [d4794a871ac74f519ca7da827b1a964c47882a62]
#
# patch "packages/file/file-native_4.21.bb"
# from [7f56042d15332b2149b6e86a6180dd1e4707ae80]
# to [29075960c23f8de964fe35362d349c591f2b870f]
#
# patch "packages/gsm/files/sms-hacks.patch"
# from [050b68da310e9160382328247350003d4065017d]
# to [e8e5cfc849a5bf268c17517dea0877eef02ccb74]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [9f4f14eaa3f730354da2b2506274dbb79c4e155a]
# to [bf003124acd3b23025d8484c94c45afc2363454c]
#
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
# from [26f95f7ca147900b49432aadc380a147c5b707f2]
# to [ba398de151a5bc2ea75292294c1b6fe604547529]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [287c0e28376a34132ad66d96f657e7b35fbabfdb]
# to [96268eb00aea83baa6ac6f978f6a6725dd61f5c1]
#
============================================================
--- packages/gsm/files/mlbuf-in-gsmd-struct.patch c792becbe959d694d9e19d4b3f5fe7d77d46de94
+++ packages/gsm/files/mlbuf-in-gsmd-struct.patch c792becbe959d694d9e19d4b3f5fe7d77d46de94
@@ -0,0 +1,102 @@
+Index: gsm/include/gsmd/gsmd.h
+===================================================================
+--- gsm.orig/include/gsmd/gsmd.h 2007-07-31 14:07:47.000000000 +0200
++++ gsm/include/gsmd/gsmd.h 2007-07-31 14:09:02.000000000 +0200
+@@ -74,6 +74,8 @@
+ struct gsmd_device_state dev_state;
+
+ struct llist_head operators; /* cached list of operator names */
++ unsigned int mlbuf_len;
++ unsigned char *mlbuf; /* ml_parse buffer */
+ };
+
+ struct gsmd_user {
+Index: gsm/src/gsmd/atcmd.c
+===================================================================
+--- gsm.orig/src/gsmd/atcmd.c 2007-07-31 14:06:49.000000000 +0200
++++ gsm/src/gsmd/atcmd.c 2007-07-31 14:12:33.000000000 +0200
+@@ -175,9 +175,7 @@
+ {
+ struct gsmd *g = ctx;
+ struct gsmd_atcmd *cmd = NULL;
+- static char mlbuf[MLPARSE_BUF_SIZE];
+ int rc = 0, final = 0;
+- int mlbuf_len;
+
+ DEBUGP("buf=`%s'(%d)\n", buf, len);
+
+@@ -273,15 +271,15 @@
+
+ /* it might be a multiline response, so if there's a previous
+ response, send out mlbuf and start afresh with an empty buffer */
+- if (mlbuf[0] != 0) {
++ if (g->mlbuf[0] != 0) {
+ if (!cmd->cb) {
+ gsmd_log(GSMD_NOTICE, "command without cb!!!\n");
+ } else {
+ DEBUGP("Calling cmd->cb()\n");
+- cmd->resp = mlbuf;
++ cmd->resp = g->mlbuf;
+ rc = cmd->cb(cmd, cmd->ctx, cmd->resp);
+ DEBUGP("Clearing mlbuf\n");
+- mlbuf[0] = 0;
++ g->mlbuf[0] = 0;
+ }
+ }
+
+@@ -334,16 +332,16 @@
+ /* we reach here, if we are at an information response that needs to be
+ * passed on */
+
+- if (mlbuf[0] == 0) {
++ if (g->mlbuf[0] == 0) {
+ DEBUGP("Filling mlbuf\n");
+- strncat(mlbuf, buf, sizeof(mlbuf)-1);
++ strncat(g->mlbuf, buf, MLPARSE_BUF_SIZE-1);
+ } else {
+ DEBUGP("Appending buf to mlbuf\n");
+- mlbuf_len = strlen(mlbuf);
+- if (mlbuf_len+1 < sizeof(mlbuf)) {
+- mlbuf[mlbuf_len] = '\n';
+- mlbuf[mlbuf_len+1] = '\0';
+- strncat(mlbuf, buf, sizeof(mlbuf)-mlbuf_len-2);
++ g->mlbuf_len = strlen(g->mlbuf);
++ if (g->mlbuf_len+1 < MLPARSE_BUF_SIZE) {
++ g->mlbuf[g->mlbuf_len] = '\n';
++ g->mlbuf[g->mlbuf_len+1] = '\0';
++ strncat(g->mlbuf, buf, MLPARSE_BUF_SIZE-g->mlbuf_len-2);
+ } else {
+ DEBUGP("response too big for mlbuf!!!\n");
+ return -EFBIG;
+@@ -365,13 +363,13 @@
+ } else {
+ DEBUGP("Calling final cmd->cb()\n");
+ /* send final result code if there is no information response in mlbuf */
+- if (mlbuf[0] == 0)
++ if (g->mlbuf[0] == 0)
+ cmd->resp = buf;
+ else
+- cmd->resp = mlbuf;
++ cmd->resp = g->mlbuf;
+ rc = cmd->cb(cmd, cmd->ctx, cmd->resp);
+ DEBUGP("Clearing mlbuf\n");
+- mlbuf[0] = 0;
++ g->mlbuf[0] = 0;
+ }
+
+ /* remove from list of currently executing cmds */
+Index: gsm/src/gsmd/gsmd.c
+===================================================================
+--- gsm.orig/src/gsmd/gsmd.c 2007-07-31 14:06:47.000000000 +0200
++++ gsm/src/gsmd/gsmd.c 2007-07-31 14:06:50.000000000 +0200
+@@ -300,6 +300,10 @@
+ {
+ INIT_LLIST_HEAD(&g->users);
+
++ g->mlbuf = talloc_array(gsmd_tallocs, unsigned char, MLPARSE_BUF_SIZE);
++ if (!g->mlbuf)
++ return -ENOMEM;
++
+ return 0;
+ }
+
============================================================
--- classes/base.bbclass 8ae82b899b740b9da403e698610bf6ca49f8e64c
+++ classes/base.bbclass 26453f8831d23d5ae6400f403116c9272347807d
@@ -892,6 +892,13 @@ python () {
base_after_parse(d)
}
+# Remove me when we switch to bitbake 1.8.8
+def base_get_srcrev(d):
+ import bb
+
+ if bb.fetch.get_srcrev:
+ return bb.fetch.get_srcrev(d)
+ return "NOT IMPLEMENTED"
# Patch handling
inherit patch
============================================================
--- conf/bitbake.conf ee130e54dc68eb5516e965696fbced464a542166
+++ conf/bitbake.conf d7da259bfd8ea8f8052f4258ba7b9c6e58a864ef
@@ -365,7 +365,7 @@ SRCDATE = "${DATE}"
UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
SRCDATE = "${DATE}"
-SRCREV = "${@bb.fetch.get_srcrev(d)}"
+SRCREV = "${@base_get_srcrev(d)}"
SRC_URI = "file://${FILE}"
============================================================
--- contrib/mtn2cl/mtn2cl.sh 89788c2d8ed63aa5ab3469b7c152d93de8ec1af6
+++ contrib/mtn2cl/mtn2cl.sh d4794a871ac74f519ca7da827b1a964c47882a62
@@ -1,9 +1,8 @@
#/bin/sh
-# This script takes the last 1000 revs and writes a ChangeLog
-
mkdir logs
+export LOGNAME=Changelog.`date -u "+%Y%m%d"`
export REV_NOW=`mtn automate heads |head -n1`
for i in `mtn log --brief --no-graph --no-merges --from l:"1 week ago" --to ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \
@@ -17,9 +16,9 @@ for i in * ; do \
cd logs
for i in * ; do \
- echo $i: >> ../ChangeLog
- cat $i >> ../ChangeLog
- echo >> ../ChangeLog
+ echo $i: >> ../${LOGNAME}
+ cat $i >> ../${LOGNAME}
+ echo >> ../${LOGNAME}
done
cd ..
@@ -30,13 +29,13 @@ RESOLVED_BUGS="`cat logs/resolved-bugs.c
NEW_BUGS="`cat logs/new-bugs.csv | wc -l | tr -d " "`"
RESOLVED_BUGS="`cat logs/resolved-bugs.csv | wc -l | tr -d " "`"
-echo -e "\n\nBugs fixed:" >> ChangeLog
-cat logs/resolved-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog
+echo -e "\n\nBugs fixed:" >> ${LOGNAME}
+cat logs/resolved-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ${LOGNAME}
-echo -e "\n\nBugs opened:" >> ChangeLog
-cat logs/new-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog
+echo -e "\n\nBugs opened:" >> ${LOGNAME}
+cat logs/new-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ${LOGNAME}
-echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ChangeLog
+echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ${LOGNAME}
rm -Rf logs
============================================================
--- packages/file/file-native_4.21.bb 7f56042d15332b2149b6e86a6180dd1e4707ae80
+++ packages/file/file-native_4.21.bb 29075960c23f8de964fe35362d349c591f2b870f
@@ -1,6 +1,6 @@ inherit native
require file_${PV}.bb
inherit native
-DEPENDS = ""
+DEPENDS = "zlib-native"
PR = "r0"
SRC_URI += "file://native-fix.diff;patch=1"
============================================================
--- packages/gsm/files/sms-hacks.patch 050b68da310e9160382328247350003d4065017d
+++ packages/gsm/files/sms-hacks.patch e8e5cfc849a5bf268c17517dea0877eef02ccb74
@@ -17,8 +17,8 @@ Index: gsm/include/gsmd/gsmd.h
Index: gsm/include/gsmd/gsmd.h
===================================================================
---- gsm.orig/include/gsmd/gsmd.h 2007-07-31 11:44:32.000000000 +0200
-+++ gsm/include/gsmd/gsmd.h 2007-07-31 11:46:44.000000000 +0200
+--- gsm.orig/include/gsmd/gsmd.h 2007-07-31 14:09:02.000000000 +0200
++++ gsm/include/gsmd/gsmd.h 2007-07-31 14:23:32.000000000 +0200
@@ -27,6 +27,7 @@
u_int32_t buflen;
u_int16_t id;
@@ -52,7 +52,7 @@ Index: gsm/include/gsmd/gsmd.h
struct gsmd {
unsigned int flags;
-@@ -92,7 +97,8 @@
+@@ -94,7 +99,8 @@
extern int gsmdlog_init(const char *path);
/* write a message to the daemons' logfile */
@@ -64,8 +64,8 @@ Index: gsm/include/gsmd/usock.h
__gsmd_log(level, __FILE__, __LINE__, __FUNCTION__, format, ## args)
Index: gsm/include/gsmd/usock.h
===================================================================
---- gsm.orig/include/gsmd/usock.h 2007-07-31 11:44:32.000000000 +0200
-+++ gsm/include/gsmd/usock.h 2007-07-31 11:46:44.000000000 +0200
+--- gsm.orig/include/gsmd/usock.h 2007-07-31 13:58:37.000000000 +0200
++++ gsm/include/gsmd/usock.h 2007-07-31 14:23:32.000000000 +0200
@@ -139,7 +139,7 @@
/* for SMS-SUBMIT, SMS-DELIVER */
enum gsmd_sms_tp_udhi {
@@ -124,8 +124,8 @@ Index: gsm/include/gsmd/vendorplugin.h
u_int8_t index1;
Index: gsm/include/gsmd/vendorplugin.h
===================================================================
---- gsm.orig/include/gsmd/vendorplugin.h 2007-07-31 11:46:28.000000000 +0200
-+++ gsm/include/gsmd/vendorplugin.h 2007-07-31 11:46:44.000000000 +0200
+--- gsm.orig/include/gsmd/vendorplugin.h 2007-07-31 13:58:38.000000000 +0200
++++ gsm/include/gsmd/vendorplugin.h 2007-07-31 14:23:32.000000000 +0200
@@ -12,7 +12,7 @@
struct gsmd_vendor_plugin {
struct llist_head list;
@@ -137,8 +137,8 @@ Index: gsm/include/libgsmd/sms.h
int (*detect)(struct gsmd *g);
Index: gsm/include/libgsmd/sms.h
===================================================================
---- gsm.orig/include/libgsmd/sms.h 2007-07-31 11:44:32.000000000 +0200
-+++ gsm/include/libgsmd/sms.h 2007-07-31 11:46:44.000000000 +0200
+--- gsm.orig/include/libgsmd/sms.h 2007-07-31 13:58:38.000000000 +0200
++++ gsm/include/libgsmd/sms.h 2007-07-31 14:23:32.000000000 +0200
@@ -83,7 +83,7 @@
extern int lgsmd_sms_send(struct lgsm_handle *lh, const struct lgsm_sms *sms);
@@ -150,8 +150,8 @@ Index: gsm/src/gsmd/atcmd.c
/* Packing of 7-bit characters, refer to GSM 03.38 subclause 6.1.2.1.1 */
Index: gsm/src/gsmd/atcmd.c
===================================================================
---- gsm.orig/src/gsmd/atcmd.c 2007-07-31 11:46:42.000000000 +0200
-+++ gsm/src/gsmd/atcmd.c 2007-07-31 11:47:03.000000000 +0200
+--- gsm.orig/src/gsmd/atcmd.c 2007-07-31 14:13:00.000000000 +0200
++++ gsm/src/gsmd/atcmd.c 2007-07-31 14:23:32.000000000 +0200
@@ -82,9 +82,12 @@
switch (llp->state) {
@@ -202,7 +202,7 @@ Index: gsm/src/gsmd/atcmd.c
}
return 0;
-@@ -178,7 +197,7 @@
+@@ -175,7 +194,7 @@
{
struct gsmd *g = ctx;
struct gsmd_atcmd *cmd = NULL;
@@ -211,7 +211,7 @@ Index: gsm/src/gsmd/atcmd.c
DEBUGP("buf=`%s'(%d)\n", buf, len);
-@@ -232,7 +251,6 @@
+@@ -229,7 +248,6 @@
DEBUGP("error number %lu\n", err_nr);
if (cmd)
cmd->ret = err_nr;
@@ -219,7 +219,7 @@ Index: gsm/src/gsmd/atcmd.c
goto final_cb;
}
if (!strncmp(buf+1, "CMS ERROR", 9)) {
-@@ -242,7 +260,6 @@
+@@ -239,7 +257,6 @@
DEBUGP("error number %lu\n", err_nr);
if (cmd)
cmd->ret = err_nr;
@@ -227,26 +227,26 @@ Index: gsm/src/gsmd/atcmd.c
goto final_cb;
}
-@@ -274,7 +291,7 @@
+@@ -271,7 +288,7 @@
/* it might be a multiline response, so if there's a previous
response, send out mlbuf and start afresh with an empty buffer */
-- if (mlbuf[0] != 0) {
-+ if (mlbuf_len) {
+- if (g->mlbuf[0] != 0) {
++ if (g->mlbuf_len) {
if (!cmd->cb) {
gsmd_log(GSMD_NOTICE, "command without cb!!!\n");
} else {
-@@ -282,8 +299,8 @@
- cmd->resp = mlbuf;
+@@ -279,8 +296,8 @@
+ cmd->resp = g->mlbuf;
rc = cmd->cb(cmd, cmd->ctx, cmd->resp);
DEBUGP("Clearing mlbuf\n");
-- mlbuf[0] = 0;
+- g->mlbuf[0] = 0;
}
-+ mlbuf_len = 0;
++ g->mlbuf_len = 0;
}
/* the current buf will be appended to mlbuf below */
-@@ -302,7 +319,6 @@
+@@ -299,7 +316,6 @@
DEBUGP("unspecified error\n");
if (cmd)
cmd->ret = 4;
@@ -254,7 +254,7 @@ Index: gsm/src/gsmd/atcmd.c
goto final_cb;
}
-@@ -311,7 +327,6 @@
+@@ -308,7 +324,6 @@
/* Part of Case 'C' */
if (cmd)
cmd->ret = 0;
@@ -262,7 +262,7 @@ Index: gsm/src/gsmd/atcmd.c
goto final_cb;
}
-@@ -320,14 +335,12 @@
+@@ -317,14 +332,12 @@
if (!strncmp(buf, "NO CARRIER", 11) ||
((g->flags & GSMD_FLAG_V0) && buf[0] == '3')) {
/* Part of Case 'D' */
@@ -277,57 +277,57 @@ Index: gsm/src/gsmd/atcmd.c
goto final_cb;
}
}
-@@ -335,21 +348,13 @@
+@@ -332,21 +345,13 @@
/* we reach here, if we are at an information response that needs to be
* passed on */
-- if (mlbuf[0] == 0) {
+- if (g->mlbuf[0] == 0) {
- DEBUGP("Filling mlbuf\n");
-- strncat(mlbuf, buf, sizeof(mlbuf)-1);
+- strncat(g->mlbuf, buf, MLPARSE_BUF_SIZE-1);
- } else {
- DEBUGP("Appending buf to mlbuf\n");
-- mlbuf_len = strlen(mlbuf);
-- if (mlbuf_len+1 < sizeof(mlbuf)) {
-- mlbuf[mlbuf_len] = '\n';
-- mlbuf[mlbuf_len+1] = '\0';
-- strncat(mlbuf, buf, sizeof(mlbuf)-mlbuf_len-2);
+- g->mlbuf_len = strlen(g->mlbuf);
+- if (g->mlbuf_len+1 < MLPARSE_BUF_SIZE) {
+- g->mlbuf[g->mlbuf_len] = '\n';
+- g->mlbuf[g->mlbuf_len+1] = '\0';
+- strncat(g->mlbuf, buf, MLPARSE_BUF_SIZE-g->mlbuf_len-2);
- } else {
- DEBUGP("response too big for mlbuf!!!\n");
- return -EFBIG;
- }
- }
-+ if (mlbuf_len)
-+ mlbuf[mlbuf_len ++] = '\n';
++ if (g->mlbuf_len)
++ g->mlbuf[g->mlbuf_len ++] = '\n';
+ DEBUGP("Appending buf to mlbuf\n");
-+ if (len > sizeof(mlbuf) - mlbuf_len)
-+ len = sizeof(mlbuf) - mlbuf_len;
-+ memcpy(mlbuf + mlbuf_len, buf, len);
-+ mlbuf_len += len;
++ if (len > MLPARSE_BUF_SIZE - g->mlbuf_len)
++ len = MLPARSE_BUF_SIZE - g->mlbuf_len;
++ memcpy(g->mlbuf + g->mlbuf_len, buf, len);
++ g->mlbuf_len += len;
return 0;
final_cb:
-@@ -366,13 +371,16 @@
+@@ -363,13 +368,16 @@
} else {
DEBUGP("Calling final cmd->cb()\n");
/* send final result code if there is no information response in mlbuf */
-- if (mlbuf[0] == 0)
+- if (g->mlbuf[0] == 0)
- cmd->resp = buf;
- else
-+ if (mlbuf_len) {
- cmd->resp = mlbuf;
-+ mlbuf[mlbuf_len] = 0;
++ if (g->mlbuf_len) {
+ cmd->resp = g->mlbuf;
++ g->mlbuf[g->mlbuf_len] = 0;
+ gsmd_log(GSMD_NOTICE,
+ "the text discarded is %s\n", buf);
+ } else
+ cmd->resp = buf;
rc = cmd->cb(cmd, cmd->ctx, cmd->resp);
DEBUGP("Clearing mlbuf\n");
-- mlbuf[0] = 0;
-+ mlbuf_len = 0;
+- g->mlbuf[0] = 0;
++ g->mlbuf_len = 0;
}
/* remove from list of currently executing cmds */
-@@ -385,7 +393,15 @@
+@@ -382,7 +390,15 @@
g->gfd_uart.when |= GSMD_FD_WRITE;
return rc;
@@ -344,7 +344,7 @@ Index: gsm/src/gsmd/atcmd.c
/* callback to be called if [virtual] UART has some data for us */
static int atcmd_select_cb(int fd, unsigned int what, void *data)
-@@ -393,6 +409,7 @@
+@@ -390,6 +406,7 @@
int len, rc;
static char rxbuf[1024];
struct gsmd *g = data;
@@ -352,7 +352,7 @@ Index: gsm/src/gsmd/atcmd.c
if (what & GSMD_FD_READ) {
memset(rxbuf, 0, sizeof(rxbuf));
-@@ -416,8 +433,12 @@
+@@ -413,8 +430,12 @@
if ((what & GSMD_FD_WRITE) && g->interpreter_ready) {
struct gsmd_atcmd *pos, *pos2;
llist_for_each_entry_safe(pos, pos2, &g->pending_atcmds, list) {
@@ -367,7 +367,7 @@ Index: gsm/src/gsmd/atcmd.c
if (rc == 0) {
gsmd_log(GSMD_ERROR, "write returns 0, aborting\n");
break;
-@@ -426,27 +447,32 @@
+@@ -423,27 +444,32 @@
fd, rc);
return rc;
}
@@ -414,7 +414,7 @@ Index: gsm/src/gsmd/atcmd.c
return 0;
}
-@@ -457,10 +483,10 @@
+@@ -454,10 +480,10 @@
{
int buflen = strlen(cmd);
struct gsmd_atcmd *atcmd;
@@ -427,7 +427,7 @@ Index: gsm/src/gsmd/atcmd.c
atcm%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list