X-Git-Url: https://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=common%2Fmisc.c;h=bf9887b921221fa1453389d98c8edae8d69297e9;hp=d9c57ad824830c8774dd7c7ca764d79f72ac1bb4;hb=49dd905279a8e62936e3713510ab0fd738e20ecb;hpb=4ee1266711b695852ec88f06784fd84400cd70bb

diff --git a/common/misc.c b/common/misc.c
index d9c57ad..bf9887b 100644
--- a/common/misc.c
+++ b/common/misc.c
@@ -11,11 +11,8 @@
   $Id$
   
   $Log$
-  Revision 1.1.1.1  2001/11/25 21:59:04  short
-  :pserver:cvs@pserver.samba.org:/cvsroot - gnokii - Sun Nov 25 22:56 CET 2001
-
-  Revision 1.19  2001/11/22 17:56:53  pkot
-  smslib update. sms sending
+  Revision 1.1.1.9  2002/04/03 00:07:59  short
+  Found in "gnokii-working" directory, some November-patches version
 
   Revision 1.18  2001/09/09 21:45:49  machek
   Cleanups from Ladislav Michl <ladis@psi.cz>:
@@ -46,8 +43,10 @@
 */
 
 #include <string.h>
+#include <stdlib.h>
 #include "misc.h"
 
+
 int GetLine(FILE *File, char *Line, int count)
 {
 	char *ptr;
@@ -88,7 +87,7 @@ static PhoneModel models[] = {
 	{"616x",  "NSW-3", PM_CALLERGROUP | PM_CALENDAR | PM_NETMONITOR | PM_KEYBOARD | PM_SMS | PM_DTMF | PM_DATA | PM_SPEEDDIAL | PM_AUTHENTICATION },
 	{"6185",  "NSD-3", PM_CALLERGROUP | PM_CALENDAR | PM_NETMONITOR | PM_KEYBOARD | PM_SMS | PM_DTMF | PM_DATA | PM_SPEEDDIAL | PM_AUTHENTICATION },
 	{"6190",  "NSB-3", PM_CALLERGROUP | PM_CALENDAR | PM_NETMONITOR | PM_KEYBOARD | PM_SMS | PM_DTMF | PM_DATA | PM_SPEEDDIAL | PM_AUTHENTICATION },
-	{"6210",  "NPE-3", PM_CALLERGROUP | PM_CALENDAR | PM_EXTPBK | PM_SMS},
+	{"6210",  "NPE-3", PM_CALLERGROUP | PM_CALENDAR | PM_EXTPBK },
 	{"6250",  "NHM-3", PM_CALLERGROUP | PM_CALENDAR | PM_EXTPBK },
 	{"7110",  "NSE-5", PM_CALLERGROUP | PM_SPEEDDIAL | PM_EXTPBK },
 	{"8810",  "NSE-6", PM_SMS | PM_DTMF | PM_DATA },
@@ -100,6 +99,11 @@ static PhoneModel models[] = {
 	{"540",   "THF-11", 0 },
 	{"650",   "THF-12", 0 },
 	{"640",   "THF-13", 0 },
+/* "AT" modele, all are prefixed by "AT-" to not to clash with FBUS interface to the same phone! 
+ */
+	{"M20",   "AT-M20",                            PM_SMS },
+	{"9110",  "AT-RAE-2",                          PM_SMS },
+	{"9210",  "AT-Nokia Communicator GSM900/1800", PM_SMS },
 	{NULL,    NULL, 0 }
 };
 
@@ -126,4 +130,49 @@ inline char *GetModel (const char *num)
 	return (GetPhoneModel(num)->model);
 }
 
+#ifndef HAVE_VASPRINTF
+/* Adapted from snprintf(3) man page: */
+int gvasprintf(char **destp,const char *fmt,va_list ap)
+{
+int n,size=0x100;
+char *p,*pnew;
+
+	if (!(p=malloc(size))) {
+		*destp=NULL;
+		return(-1);
+		}
+	for (;;) {
+		/* Try to print in the allocated space. */
+		n=gvsprintf(p,size,fmt,ap);
+		/* If that worked, return the string. */
+		if (n>-1 && n<size) {
+			*destp=p;
+			return(n);
+			}
+		/* Else try again with more space. */
+		if (n>-1)	/* glibc 2.1 */
+			size=n+1;	/* precisely what is needed */
+		else		/* glibc 2.0 */
+			size*=2;	/* twice the old size */
+		if (!(pnew=realloc(p,size))) {
+			free(p);
+			*destp=NULL;
+			return(-1);
+			}
+		p=pnew;
+	}
+}
+#endif
+
+#ifndef HAVE_ASPRINTF
+int gasprintf(char **destp,const char *fmt,...)
+{
+va_list ap;
+int r;
 
+	va_start(ap,fmt);
+	r=gvasprintf(destp,fmt,ap);
+	va_end(ap);
+	return(r);
+}
+#endif