X-Git-Url: http://git.jankratochvil.net/?p=mdsms.git;a=blobdiff_plain;f=mdsms.c;h=2b7edd1d795a576593d123e8de9823c47e1d4a2d;hp=845c6297691f88a198dd2a8d495f33aa32cab68f;hb=ac11bc9838ab29cd6b65168ebae994e8f03f1f43;hpb=3b127365dbbc640bc1a0813b24baa925b99f5079 diff --git a/mdsms.c b/mdsms.c index 845c629..2b7edd1 100644 --- a/mdsms.c +++ b/mdsms.c @@ -56,6 +56,9 @@ static char rcsid[] ATTR_UNUSED = "$Id$"; #ifdef HAVE_SYS_POLL_H #include #endif +#ifdef HAVE_LOCALE_H +#include +#endif #ifdef HAVE_GETOPT_LONG #include @@ -83,7 +86,7 @@ static char rcsid[] ATTR_UNUSED = "$Id$"; #define d7(n1,n2,n3,n4,n5,n6,n7) dB((dO,n1,n2,n3,n4,n5,n6,n7 )) #define d8(n1,n2,n3,n4,n5,n6,n7,n8) dB((dO,n1,n2,n3,n4,n5,n6,n7,n8)) -static const char version[]="This is Mobile Device SMS tool (" PACKAGE " " VERSION ")\n"; +static const char version[]="Mobile Device SMS tool (" PACKAGE " " VERSION ")\n"; static int verbose #ifdef DEBUG @@ -101,6 +104,8 @@ static size_t bodylen; static char *body; /* --logo-send specific */ static char *logoname,*gsmnet; +/* --ring-send specific */ +static char *ringname; static enum modenum { MODE_UNKNOWN=0, @@ -109,7 +114,8 @@ static enum modenum { MODE_SEND =MODE_FIRST+0, /* --send / --send-mobildock */ MODE_SEND_MOBILDOCK=MODE_FIRST+1, /* --send-mobildock in before readtimen is set */ MODE_RECEIVE =MODE_FIRST+2, /* --receive */ - MODE_LOGO_SEND =MODE_FIRST+3 /* --logo-send */ + MODE_LOGO_SEND =MODE_FIRST+3, /* --logo-send */ + MODE_RING_SEND =MODE_FIRST+4 /* --ring-send */ } mode=MODE_UNKNOWN; #define MODE_ORDER(x) ((x)-MODE_FIRST) #define MODE_NAME(x) (longopts[MODE_ORDER((x))].name) @@ -138,7 +144,7 @@ char host[LINE_MAX]; if (!logf) return; if (mypid==-1) { mypid=getpid(); - if (gethostname(host,sizeof(host))) strcpy(host,""); + if (gethostname(host,sizeof(host))) strcpy(host,_("")); } time(&stamp); ctm=ctime(&stamp); @@ -185,7 +191,7 @@ char fatal,pm; static void chk(const void *p) { if (p) return; - error("!Virtual memory exhausted"); + error(_("!Virtual memory exhausted")); } static char *devcmd(const char *term,const char *catch,const char *send,...) ATTR_PRINTFORMAT(3,4); @@ -197,7 +203,7 @@ static void unlockdevice(int hard) if (!hard && locked>1) { locked--; return; } d2("Removing lockfile \"%s\"\n",lockreal); if (unlink(lockreal)) - error("^Error removing my device lockfile \"%s\"",lockreal); + error(_("^Error removing my device lockfile \"%s\""),lockreal); locked=0; } @@ -214,7 +220,7 @@ char *cmd=restore; } if (restios_yes) { if (tcsetattr(devfd,TCSANOW,&restios)) - error("^Error restoring termios for device"); + error(_("^Error restoring termios for device")); restios_yes=0; } unlockdevice(1); @@ -224,11 +230,11 @@ char *cmd=restore; static void usage(void) { - fprintf(stderr,"\ + fprintf(stderr,_("\ \n\ %s\ \n\ -Usage: " PACKAGE " [-c|--config ] [-d|--device ]\n\ +Usage: %s [-c|--config ] [-d|--device ]\n\ {--send | --send-mobildock | --receive | --logo-send}\n\ [-L|--log ] [-b|--baud ]\n\ [-l|--lockfile ] [-s|--smsc ] [-m|--maxretry <#>]\n\ @@ -240,18 +246,21 @@ Usage: " PACKAGE " [-c|--config ] [-d|--device ]\n\ \n\ --logo-send:\n\ []\n\ + --ring-send:\n\ + \n\ \n\ -c, --config\tRead this additional config file\n\ -\t\t(def. \"" CONFIG_MAIN "\" and \"$HOME" CONFIG_HOME "\")\n\ - -d, --device\tMobile on this serial device (def. \"" DEF_DEVICE "\")\n\ - -L, --log\tLog all important messages to this file (def. \"" DEF_LOGNAME "\")\n\ +\t\t(def. \"%s\" and \"$HOME%s\")\n\ + -d, --device\tMobile on this serial device (def. \"%s\")\n\ + -L, --log\tLog all important messages to this file (def. \"%s\")\n\ -b, --baud\tSet baudrate, 2400-57600 supported (def. %d)\n\ -l, --lockfile\tLock serial port by this file, \"%%s\" is basename of device\n\ \t\t(def. \"%s\")\n\ -s, --smsc\tUse this SMS Center number (def. query from mobile)\n\ -m, --maxretry\tMaximum retries of any command before giving up (def. %d)\n\ -r, --readtime\tSeconds for maximum wait time for response\n\ -\t\t(def. %ds standard, %ds for MobilDock modes, multiplied %dx for long cmds)\n\ +\t\t(def. %ds standard, %ds for MobilDock modes,\n\ +\t\t multiplied %dx for long cmds)\n\ -t, --chartime\tMilliseconds between each char (def. %dms)\n\ -T, --cmdtime\tMilliseconds before each whole AT command (def. %dms)\n\ -v, --verbose\tIncrease verbosity level, more \"-v\"s give more messages\n\ @@ -268,13 +277,14 @@ Usage: " PACKAGE " [-c|--config ] [-d|--device ]\n\ \t\t%%t - ctime(3) style timestamp (e.g. \"Wed Jun 30 21:49:08 1993\")\n\ --logo-send:\n\ \t* Oper. logo: Enter custom network code MccMnc, e.g. 23002\n\ -\t\t* Oper. logo: Specify \"" WORD_NET "\" to read network code from NOL file\n\ -\t\t* Group gfx : Specify \"" WORD_GROUP "\" to send logo as group graphics\n\ +\t\t* Oper. logo: Specify \"%s\" to read network code from NOL file\n\ +\t\t* Group gfx : Specify \"%s\" to send logo as group graphics\n\ \n\ You may need to use the following line to catch all of this help text:\n\ ./mdsms 2>&1|more\n\ -\n",version,DEF_BAUD,DEF_LOCKFILE,DEF_MAXRETRY, -DEF_READTIME,DEF_READTIME_MOBILDOCK,EXT_READTIME,DEF_CHARTIME,DEF_CMDTIME); +\n"),version,PACKAGE,CONFIG_MAIN,CONFIG_HOME,DEF_DEVICE,DEF_LOGNAME,DEF_BAUD,DEF_LOCKFILE,DEF_MAXRETRY, +DEF_READTIME,DEF_READTIME_MOBILDOCK,EXT_READTIME,DEF_CHARTIME,DEF_CMDTIME, +WORD_NET,WORD_GROUP); exit(EXIT_FAILURE); } @@ -284,10 +294,13 @@ static const struct option longopts[]={ {"send-mobildock",0,0,MODE_SEND_MOBILDOCK}, {"receive" ,0,0,MODE_RECEIVE}, {"logo-send" ,0,0,MODE_LOGO_SEND}, +{"ring-send" ,0,0,MODE_RING_SEND}, /* Mode aliases may follow in no particular order * * as long as no non-mode options is between them */ {"send-md" ,0,0,MODE_SEND_MOBILDOCK}, {"recv" ,0,0,MODE_RECEIVE}, +{"logo" ,0,0,MODE_LOGO_SEND}, +{"ring" ,0,0,MODE_RING_SEND}, {"config" ,1,0,'c'}, {"device" ,1,0,'d'}, {"log" ,1,0,'L'}, @@ -311,7 +324,19 @@ static unsigned cfgstacki=0; static void chkfclose(FILE *f,const char *fname) { if (fclose(f)) - error("^Error closing \"%s\"",fname); + error(_("^Error closing \"%s\""),fname); +} + +static long getfilesize(FILE *f,const char *fname) +{ +long size; + + if (fseek(f,0,SEEK_END)) + error(_("^Error seeking to end of \"%s\""),fname); + if ((size=ftell(f))<0) + size=-1,error(_("^Error measuring length of \"%s\""),fname); + rewind(f); + return(size); } static void readfile(const char *fname,char quiet) @@ -325,26 +350,22 @@ long size; static unsigned tot=0; if (tot++>=MAXCFGNUM) { - if (tot==MAXCFGNUM+1) error("Too many config files to read, max is %d, break-out",MAXCFGNUM); + if (tot==MAXCFGNUM+1) error(_("Too many config files to read, max is %d, break-out"),MAXCFGNUM); return; } if (!(f=fopen(fname,"rt"))) { - if (!quiet) error("^Can't open config file \"%s\" for r/o",fname); + if (!quiet) error(_("^Can't open config file \"%s\" for r/o"),fname); return; } - if (verbose>=2) error(".Reading config file \"%s\"",fname); - if (fseek(f,0,SEEK_END)) - error("^Error seeking to end of \"%s\"",fname); - if ((size=ftell(f))<0) - size=0,error("^Error measuring \"%s\"",fname); + if (verbose>=2) error(_(".Reading config file \"%s\""),fname); + if ((size=getfilesize(f,fname))==-1) size=0; if (size>MAXCONFIG) - error("File \"%s\" is too long, read only %d bytes",fname,MAXCONFIG); + error(_("File \"%s\" is too long, read only %d bytes"),fname,MAXCONFIG); chk(buf=malloc((size?size:MAXCONFIG)+1)); - rewind(f); got=fread(buf,1,(size?size:MAXCONFIG),f); if (size && got!=size) - error("File \"%s\" read error, got only %u bytes of %ld",fname,got,size); + error(_("File \"%s\" read error, got only %u bytes of %ld"),fname,got,size); chkfclose(f,fname); buf[got]='\0'; args[0]=pname; @@ -355,13 +376,13 @@ char c=*s; if (!blank) { *d='\0'; blank=1; - if (verbose>=2) error("\nConfig \"%s\": arg#%d: %s",fname,argp-1,args[argp-1]); + if (verbose>=2) error(_("\nConfig \"%s\": arg#%d: %s"),fname,argp-1,args[argp-1]); } continue; } if (blank) { if (argp>=NELEM(args)-1) { - error("Too many arguments in \"%s\", from offset %d ignored",fname,s-buf); + error(_("Too many arguments in \"%s\", from offset %d ignored"),fname,s-buf); break; } args[argp++]=s; @@ -511,7 +532,7 @@ int i; while ((optc=getopt_long(argp,args,"c:d:L:b:l:s:m:r:t:T:fvhV",longopts,NULL))!=EOF) switch (optc) { case 'c': if (cfgstacki>=NELEM(cfgstack)) { - error("Looping (%d) during attempt to read config file \"%s\", break-out",NELEM(cfgstack),from); + error(_("Looping (%d) during attempt to read config file \"%s\", break-out"),NELEM(cfgstack),from); break; } chk(cfgstack[cfgstacki++]=strdup(optarg)); @@ -534,6 +555,7 @@ int i; case MODE_SEND_MOBILDOCK: case MODE_RECEIVE: case MODE_LOGO_SEND: + case MODE_RING_SEND: if (mode_stamp && mode_stamp!=seq) break; mode=optc; mode_stamp=seq; @@ -549,7 +571,7 @@ int i; exit(EXIT_FAILURE); default: if (optc!='h') - error("\nLast getopt(3) error occured during parsing option %d from \"%s\"! Follows help:",optind-1,from); + error(_("\nLast getopt(3) error occured during parsing option %d from \"%s\"! Follows help:"),optind-1,from); usage(); break; } @@ -570,12 +592,13 @@ static const struct nullcheck { const char *name; } nullcheck[]={ {&phone,MODE_BIT(MODE_SEND)|MODE_BIT(MODE_SEND_MOBILDOCK)|MODE_BIT(MODE_LOGO_SEND), - "destination phone number"}, - {&logoname,MODE_BIT(MODE_LOGO_SEND),"logo filename"}, - {&body,MODE_BIT(MODE_RECEIVE),"body text"}, /* we allow empty bodies for SENDs */ + N_("destination phone number")}, + {&logoname,MODE_BIT(MODE_LOGO_SEND),N_("logo filename")}, + {&ringname,MODE_BIT(MODE_RING_SEND),N_("ring filename")}, + {&body,MODE_BIT(MODE_RECEIVE),N_("body text")}, /* we allow empty bodies for SENDs */ #if 0 - {&gsmnet,"GSM operator network code",MODE_LOGO_SEND}, - {&device,"device for communication",0}, + {&gsmnet,MODE_BIT(MODE_LOGO_SEND),N_("GSM operator network code")}, + {&device,0,N_("device for communication")}, #endif }; static char **emptycheck[]={&logname,&smsc,&logoname,&gsmnet}; @@ -595,7 +618,7 @@ static inline void cmdline_done(void) { char *s; while ((s=nextargstack())) { - error("\nExcessive option %d from \"%s\" ignored: %s", + error(_("\nExcessive option %d from \"%s\" ignored: %s"), lastargstack_index,lastargstack_from,s); free(s); } @@ -609,12 +632,12 @@ static char err[LINE_MAX]; for (s=s1=(phone+(*phone=='+'));*s && s-s1=3) error(".Checking the lockfile \"%s\"..",lockreal); + if (verbose>=3) error(_(".Checking the lockfile \"%s\".."),lockreal); if ((fd=open(lockreal,O_RDONLY))==-1) break; if ((got=read(fd,buf,sizeof(buf)-1))<=0) { isempty: if (empty>=DEVLOCK_MAXEMPTY) { - error(".Lockfile \"%s\" is still not valid, removing it",lockreal); + error(_(".Lockfile \"%s\" is still not valid, removing it"),lockreal); goto remove; } empty++; @@ -728,27 +757,27 @@ isempty: empty=0; errno=0; if (kill(pid,0) && errno!=ESRCH && errno!=EPERM) - error("^Error during checking consciousness of PID %d",pid); + error(_("^Error during checking consciousness of PID %d"),pid); if (errno!=ESRCH) { if (attempt) return(0); continue; } - error(".Lockfile \"%s\" is stale (PID %d), removing it",lockreal,pid); + error(_(".Lockfile \"%s\" is stale (PID %d), removing it"),lockreal,pid); remove: lockclose(fd); if (unlink(lockreal)) - error("^Error removing foreign lockfile \"%s\"",lockreal); + error(_("^Error removing foreign lockfile \"%s\""),lockreal); break; } errno=0; if ((fd=open(lockreal,O_WRONLY|O_CREAT|O_EXCL,0644))==-1) { if (errno==EEXIST) goto recheck; - error("^!Error creating lockfile \"%s\"",lockreal); + error(_("^!Error creating lockfile \"%s\""),lockreal); } locked=1; got=VARPRINTF(buf,"%010d\n",getpid()); assert(got==11); if (write(fd,buf,got)!=got) - error("^!Error writing data to lockfile \"%s\"",lockreal); + error(_("^!Error writing data to lockfile \"%s\""),lockreal); lockclose(fd); return((locked=1)); } @@ -768,7 +797,7 @@ static void sigalarm(int signo) { setalarm(); wasalarm=1; - if (verbose>=1) error("Timed out"); + if (verbose>=1) error(_("Timed out")); } static void blocking(char yes) @@ -776,7 +805,7 @@ static void blocking(char yes) static char state=-1; if (state==yes) return; if (fcntl(devfd,F_SETFL,(yes?0:O_NONBLOCK))) - error("^!fcntl() on device for %sblocking mode",(yes?"":"non-")); + error(_("^!fcntl() on device for %s mode"),(yes?_("blocking"):_("non-blocking"))); state=yes; } @@ -784,17 +813,15 @@ static const char *record; static char *catchdata; static size_t catchdatal,catchdatasiz; -static void catched(const char *end) +static void catched(const char *end,char edata) { size_t len; -const char *p1,*p2; +const char *p; if (!record) return; assert(end>=record); - p1=memchr(record,'\n',end-record); - p2=memchr(record,'\r',end-record); - if (!p1 || (p1 && p2 && p2catchdatasiz) @@ -803,15 +830,15 @@ const char *p1,*p2; memcpy(catchdata+catchdatal,record,len); catchdatal+=len; } - record=(p1?NULL:end); + record=(p?NULL:end); assert(catchdatal<=catchdatasiz); } static int retrycnt=0; static void retrying(void) { - if (maxretryn>=0 && ++retrycnt>maxretryn) error("!Maximum command retry count (%ld) exceeded",maxretryn); - if (verbose>=2) error(".Retrying phase, %d out of %ld..",retrycnt,maxretryn); + if (maxretryn>=0 && ++retrycnt>maxretryn) error(_("!Maximum command retry count (%ld) exceeded"),maxretryn); + if (verbose>=2) error(_(".Retrying phase, %d out of %ld.."),retrycnt,maxretryn); } static char *reform(const char *s,int slot) @@ -824,7 +851,7 @@ char c,*d; struct formslot *fs; assert(slot>=0 && slot"); + if (!s) return(_("")); if (!(fs=&arr[slot])->s) chk(fs->s=malloc(fs->l=LINE_MAX)); d=fs->s; @@ -854,27 +881,27 @@ off_t o=d-fs->s; static char *devcmd(const char *term,const char *catch,const char *send,...) ATTR_PRINTFORMAT(3,4); static char *devcmd(const char *term,const char *catch,const char *send,...) { -size_t l,bufl2,terml,catchl,fragl,offs; +size_t l,bufl2,terml,catchl=0 /* GCC happiness */,fragl,offs; static char buf[LINE_MAX]; static size_t bufl; ssize_t got; char *hit,*s; va_list ap; -char errout,extend,convcr; +char errout,extend,noconvcr,edata; long alarmtime; const char *osend; static const char emptystring[]=""; if (!term) term="\nOK\n"; - convcr=!strchr(term,'\r'); if (!strcmp(send," ")) send=NULL; /* GCC formatstring-check workaround */ if (!(osend=send)) send=""; + if ((noconvcr=(catch && *catch=='@'))) catch++; if ((errout=(*send=='!'))) send++; errout|=(maxretryn==-1); if ((extend=(*send=='~'))) send++; alarmtime=readtimen*(extend?EXT_READTIME:1); - d8("devcmd(), alarmtime=%ld, errout=%d, extend=%d, convcr=%d, osend=%p, bufl=%d, buf: %s\n", - alarmtime,errout,extend,convcr,osend,bufl,reform(buf,0)); + d8("devcmd(), alarmtime=%ld, errout=%d, extend=%d, noconvcr=%d, osend=%p, bufl=%d, buf: %s\n", + alarmtime,errout,extend,noconvcr,osend,bufl,reform(buf,0)); if (0) { err: alarm(0); @@ -888,23 +915,23 @@ err: va_start(ap,send); l=VARVPRINTF(buf,send,ap); bufl=l+(!!osend); va_end(ap); - if (bufl>=sizeof(buf)-1) error("!Command too big (%d>%d)",bufl,sizeof(buf)-1); - if (verbose>=2) error(".devcmd(send=%s,term=%s,catch=%s,timeout=%ld)", + if (bufl>=sizeof(buf)-1) error(_("!Command too big (%d>%d)"),bufl,sizeof(buf)-1); + if (verbose>=2) error(_(".devcmd(send=%s,term=%s,catch=%s,timeout=%ld)"), reform(buf,0),reform(term,1),reform(catch,2),alarmtime); if (osend) buf[l]='\r'; for (offs=0,got=0;offss && (s=memchr(s,'\0',buf+bufl2-s))) *s++=REPL_NULLCHAR; - if (verbose>=2) - error("\nGot chunk of data from device: %s",reform(buf+bufl,0)); - if (convcr) { + if (verbose>=3) + error(_("\nGot chunk of data from device: %s"),reform(buf+bufl,0)); + if (!noconvcr) { s=buf+bufl; while (buf+bufl2>s && (s=memchr(s,'\r',buf+bufl2-s))) *s++='\n'; } bufl=bufl2; - catched(buf+bufl); assert(!record || record==buf+bufl); + catched(buf+bufl,edata); assert(!record || record==buf+bufl); assert(bufl%s|%s<\n",buf,term); */ if (strstr(buf,ERROR_SUBSTR1) || strstr(buf,ERROR_SUBSTR2)) { - error("Found ERROR response on command %s",reform(send,0)); + error(_("Found ERROR response on command %s"),reform(send,0)); goto err; } - if (catch && bufl>=catchl && (hit=strstr(buf,catch))) { + if (catch && !record && bufl>=catchl && (hit=strstr(buf,catch))) { record=hit+catchl; - catched(buf+bufl); assert(!record || record==buf+bufl); + catched(buf+bufl,edata); assert(!record || record==buf+bufl); } if ( bufl>= terml && (hit=strstr(buf,term))) { memmove(buf,hit+terml,(bufl2=(buf+bufl)-(hit+terml))); bufl=bufl2; @@ -972,18 +1000,18 @@ skipread: } if (bufl=2) error(".Returning data %s for cmd %s",reform(catchdata,0),reform(send,1)); + catched(record+1,edata); + if (verbose>=2) error(_(".Returning data %s for cmd %s"),reform(catchdata,0),reform(send,1)); return(catchdata); } @@ -997,7 +1025,7 @@ unsigned char n; *++d=(plus?ADDR_INT:ADDR_NAT); while (*addr) { if (*addr<'0' || *addr>'9') - error("!Error during conversion of number at: %s",addr); + error(_("!Error during conversion of number at: %s"),addr); tot++; n=(*addr++)-'0'; if ((flip=!flip)) *++d=0xF0|n; @@ -1037,23 +1065,23 @@ unsigned char bin[2+(MAXNUMLEN+1)/2]; s=devcmd(NULL,"\n+CSCA:","\r\nAT+CSCA?"); while (isspace(*s)) s++; if (!*s || !strcmp(s,"EMPTY")) - error("!No SMS set in mobile station found, please use option \"-s\""); - if (verbose>=1) error("\nFound default SMSC in mobile: %s",s); - if (*s!='"') error("!No left-quote found in: %s",s); - if (!(t=strrchr(s+1,'"'))) error("!No right-quote found in: %s",s); + error(_("!No SMSC set in mobile station found, please use option \"-s\"")); + if (verbose>=1) error(_("\nFound default SMSC in mobile: %s"),s); + if (*s!='"') error(_("!No left-quote found in: %s"),s); + if (!(t=strrchr(s+1,'"'))) error(_("!No right-quote found in: %s"),s); if (s+1==t) - error("!No SMS set in mobile station found, please use option \"-s\""); + error(_("!No SMS set in mobile station found, please use option \"-s\"")); e=t++; while (isspace(*t)) t++; - if (*t++!=',') error("!No comma found after quotes in: %s",s); + if (*t++!=',') error(_("!No comma found after quotes in: %s"),s); while (isspace(*t)) t++; l=strtol(t,&serr,10); if ((l!=ADDR_NAT && l!=ADDR_INT) || (serr && *serr)) - error("!Type parse error in: %s",s); + error(_("!Type parse error in: %s"),s); if (l==ADDR_NAT || s[1]=='+') s++; else *s='+'; *e='\0'; - if (verbose>=2) error("\nDecoded SMSC address: %s",s); + if (verbose>=2) error(_("\nDecoded SMSC address: %s"),s); if (!NEED_PDUSMSC()) return; chk(finalsmsc=strdup(s)); bin[0]=1+(prepaddr(bin,finalsmsc)+1)/2; @@ -1071,7 +1099,7 @@ static inline unsigned char charconv(char c,size_t offs) } #if 0 if ((c>='A' && c<='Z') || (c>='a' && c<='z') || (c>='0' && c<='9')) return(c); - error("Can't convert character '%c' (0x%02X) at offs %d (0-based), substituted '?'", + error(_("Can't convert character '%c' (0x%02X) at offs %d (0-based), substituted '?'"), c,(unsigned char)c,offs); return('?'); #endif @@ -1084,7 +1112,22 @@ static inline unsigned char charconv(char c,size_t offs) */ static char *pdudata; -static char hexdata[140*2+1]; +static struct hexdata { + struct hexdata *next; + char data[140*2+1]; + } *hexdata,**hexdatatail=&hexdata; + +static void nokiaprep(unsigned char *bin,size_t w) +{ +struct hexdata *hd; + assert(w<=140); + chk(hd=malloc(sizeof(*hd))); + *hexdatatail=hd; + hd->next=NULL; + hexdatatail=&hd->next; + textconv(hd->data,bin,w); + if (verbose>=2) error(_("\nWill send hexdata: %s"),hd->data); +} static inline void logoread(void) { @@ -1097,7 +1140,7 @@ unsigned char bin[140]={ 0x15, 0x83, /* dest port (group gfx) */ 0x00, 0x00 /* src port (unused) */ }; -size_t got,r,w; +size_t got,r=0 /* GCC happiness */,w; ssize_t chars,bits; char gsmnetf[10]; int sizex,sizey,bit; @@ -1105,47 +1148,48 @@ int sizex,sizey,bit; #define WORD(n) (((unsigned char)buf[(n)])|(((unsigned char)buf[(n)+1])<<8)) if (!(f=fopen(logoname,"rb"))) - error("^!Cannot open logo file \"%s\" for r/o",logoname); + error(_("^!Cannot open logo file \"%s\" for r/o"),logoname); got=fread(buf,1,sizeof(buf),f); + chkfclose(f,logoname); if (got>=20 && !memcmp(buf,"NOL",4)) { VARPRINTF2(gsmnetf,"%03.3u%02.2u",WORD(6),WORD(8)); assert(strlen(gsmnetf)==5); r=10; - if (verbose>=1) error(".Reading NOL file \"%s\", GSMnet \"%s\", word@4=%d..", + if (verbose>=1) error(_(".Reading NOL file \"%s\", GSMnet \"%s\", word@4=%d.."), logoname,gsmnetf,WORD(4)); } else if (got>=16 && !memcmp(buf,"NGG",4)) { r=6; - if (verbose>=1) error(".Reading NGG file \"%s\", word@4=%d..", + if (verbose>=1) error(_(".Reading NGG file \"%s\", word@4=%d.."), logoname,WORD(4)); } - else error("!Unknown file format of logo file \"%s\"",logoname); + else error(_("!Unknown file format of logo file \"%s\""),logoname); if (gsmnet && !strtrycasecmp(gsmnet,WORD_NET)) { - if (!*gsmnetf) error("!NOL network code detection requested but NOL file not loaded, please specify network code"); + if (!*gsmnetf) error(_("!NOL network code detection requested but NOL file not loaded, please specify network code")); gsmnet=gsmnetf; } if (!gsmnet || !strtrycasecmp(gsmnet,WORD_GROUP) || !*gsmnet) { - error("\nSending logo as: group graphics"); + error(_("\nSending logo as: group graphics")); gsmnet=NULL; } else { - error("\nSending logo as: operator logo for \"%s\"",gsmnet); + error(_("\nSending logo as: operator logo for \"%s\""),gsmnet); bin[4]=0x82; /* dest port 0x1582 */ } sizex=WORD(r); sizey=WORD(r+2); - if (verbose>=2) error(".Magic words: @+4=%d, @+6=%d, @+8=%d", + if (verbose>=2) error(_(".Magic words: @+4=%d, @+6=%d, @+8=%d"), WORD(r+4),WORD(r+6),WORD(r+8)); r+=10; if (sizex<1 || sizex>255 - || sizey<1 || sizey>255) error("!Invalid size: %dx%d",sizex,sizey); + || sizey<1 || sizey>255) error(_("!Invalid size: %dx%d"),sizex,sizey); chars=((bits=sizex*sizey)+7)/8; - if (r+bits>got) error("!Logo file \"%s\" too short - actual=%d, need(%dx%d)=%d", + if (r+bits>got) error(_("!Logo file \"%s\" too short - actual=%d, need(%dx%d)=%d"), logoname,got,sizex,sizey,r+chars); else if (r+bits=1) error("Ignoring trailing garbage in \"%s\", used only %d bytes",logoname,r+bits); + if (verbose>=1) error(_("Ignoring trailing garbage in \"%s\", used only %d bytes"),logoname,r+bits); if ((got=(7+(gsmnet?3:0)+4+chars))>140) - error("!SMS size would be %d bytes but 140 is maximum",got); + error(_("!SMS size would be %d bytes but 140 is maximum"),got); w=7; if (gsmnet) { bin[w++]=((gsmnet[1]&0x0F)<<4)|(gsmnet[0]&0x0F); @@ -1159,15 +1203,85 @@ int sizex,sizey,bit; bin[w]=0; for (bit=0x80;(bits>0) && (bit>0);bits--,bit>>=1) { if (buf[r]!='0' && buf[r]!='1') - error("!Invalid character (neither '0' nor '1')in logo file \"%s\" at offset 0x%X", + error(_("!Invalid character (neither '0' nor '1') in logo file \"%s\" at offset 0x%X"), logoname,r); if (buf[r++]=='1') bin[w]|=bit; } w++; } - assert(chars==-1); assert(bits==0); assert(w==got); assert(w<=140); - textconv(hexdata,bin,w); - if (verbose>=2) error("\nWill send hexdata: %s",hexdata); + assert(chars==-1); assert(bits==0); assert(w==got); + nokiaprep(bin,w); +#undef WORD +} + +static inline void ringread(void) +{ +FILE *f; +unsigned char bin1[140]={ + 6, /* UDH length */ + 0x05, /* IEI */ + 0x04, /* IEDL */ + 0x15, 0x81, /* dest port (ring tones) */ + 0x15, 0x81 /* src port (unused) */ +#define BIN1_PAYLOAD (140-7) + }; +unsigned char binn[140]={ + 11, /* UDH length */ + 0x05, /* IEI */ + 0x04, /* IEDL */ + 0x15, 0x81, /* dest port (ring tones) */ + 0x15, 0x81, /* src port (unused) */ + 0x00, 0x03, /* multipart */ + /* 0x??, unique serial ID */ + /* 0x??, total messages */ + /* 0x??, message number (# from 1) */ +#define BINN_PAYLOAD (140-12) + }; +size_t got,want; +int totn,fragn; +long size; + +#define WORD(n) (((unsigned char)buf[(n)])|(((unsigned char)buf[(n)+1])<<8)) + + if (!(f=fopen(logoname,"rb"))) + error(_("^!Cannot open ring file \"%s\" for r/o"),logoname); + if ((size=getfilesize(f,logoname))==-1) + error(_("!File size determination is essential to continue operation")); + if (size<0x103) + error(_("!File \"%s\" size %ld too small (must >=0x103)! Is it .000 file?"), + logoname,size); + if (fseek(f,0x100,SEEK_SET)) + error(_("^Seeking error on \"%s\", ignoring"),logoname); + size-=0x100; + if (size<=BIN1_PAYLOAD) { + if ((got=fread(bin1+7,1,size,f))!=size) + error(_("^Read error on \"%s\", wanted %ld, got %d"),logoname,size,got); + error(_("\nSending ring tone \"%s\" as single SMS (size %ld, max %d)"), + ringname,size,BIN1_PAYLOAD); + nokiaprep(bin1,7+size); + } + else { + totn=(size+BINN_PAYLOAD-1)/BINN_PAYLOAD; + if (totn>0xFF) + error(_("!File size %ld too large even for multi-SMS ring upload (max=%d)"), + size,BINN_PAYLOAD*0xFF); + binn[10]=totn; + if (verbose>=1) + error(_("\nSending ring tone \"%s\" as %d multi-SMSes (size %ld, max %d, frag %d)"), + ringname,totn,size,BIN1_PAYLOAD,BINN_PAYLOAD); + binn[9]=time(NULL)&0x100; /* rand() would be better but it is a compatibility pain */ + if (verbose>=1) + error(_("\nUsing unique multi-SMS ID 0x%02X"),(unsigned)binn[9]); + for (fragn=1;fragn<=totn;fragn++) { + binn[11]=fragn; + want=MIN(size,BINN_PAYLOAD); + if ((got=fread(binn+12,1,want,f))!=want) + error(_("^Read error on \"%s\", wanted %d, got %d"),logoname,want,got); + nokiaprep(binn,12+want); + size-=want; + } + } + chkfclose(f,logoname); #undef WORD } @@ -1177,7 +1291,7 @@ static unsigned char pdu[64+MAXNUMLEN/2+(MAXBODYLEN*7)/8]; unsigned char *d=pdu; int i; char inb=0,outb=0,xb,*bodyr; -unsigned char inreg; +unsigned char inreg=0 /* GCC happiness */; size_t offs=0; *d++=PDU_TYPE; @@ -1188,7 +1302,7 @@ size_t offs=0; *d++=PDU_DCS; *d++=PDU_VP; if (bodylen>MAXBODYLEN) { - error("Body too large (%d>%d), cut",bodylen,MAXBODYLEN); + error(_("Body too large (%d>%d), cut"),bodylen,MAXBODYLEN); body[(bodylen=MAXBODYLEN)]='\0'; } bodyr=body; @@ -1220,7 +1334,7 @@ size_t offs=0; static inline void preparebody(void) { -FILE *fin; +FILE *fin=NULL /* GCC happiness */; char *finame; if (body && readbody) { @@ -1235,16 +1349,16 @@ char *finame; readbody=0; if (!finame) { if (verbose>=1) - error("\nPlease enter the SMS text body, end with EOF (ctrl-D):"); + error(_("\nPlease enter the SMS text body, end with EOF (ctrl-D):")); } else { if (!(fin=fopen(finame,"rt"))) - error("^!Can't open data file \"%s\" for r/o",finame); + error(_("^!Can't open data file \"%s\" for r/o"),finame); } chk(body=malloc(BODYLOAD)); bodylen=fread(body,1,BODYLOAD,fin); if (bodylen==-1) - error("^!Error reading stream \"%s\"",(finame?finame:"")); + error(_("^!Error reading stream \"%s\""),(finame?finame:_(""))); if (finame) { chkfclose(fin,finame); free(finame); @@ -1272,7 +1386,7 @@ retry: #else /* HAVE_POLL */ #ifdef HAVE_FD_SETSIZE if (devfd>=FD_SETSIZE) - error("!Device file descriptor %d can't fit in select() FD_SETSIZE (%d)", + error(_("!Device file descriptor %d can't fit in select() FD_SETSIZE (%d)"), devfd,FD_SETSIZE); #endif /* HAVE_FD_SETSIZE */ FD_ZERO(&rfds); FD_SET(devfd,&rfds); @@ -1281,14 +1395,14 @@ retry: #endif /* HAVE_POLL */ if (immed && i==0) return(0); if (i!=1) - error("^Failed (retval %d) while waiting for data, ignoring",i); + error(_("^Failed (retval %d) while waiting for data, ignoring"),i); #ifdef HAVE_POLL if (ufd.revents&(POLLERR|POLLHUP)) #else /* HAVE_POLL */ if (FD_ISSET(devfd,&xfds)) #endif /* HAVE_POLL */ - error("^Error while waiting for data, ignoring"); + error(_("^Error while waiting for data, ignoring")); #ifdef HAVE_POLL if (!(ufd.revents&POLLIN)) @@ -1296,7 +1410,7 @@ retry: if (!(FD_ISSET(devfd,&rfds))) #endif /* HAVE_POLL */ { - error("^No data input after waited for data, retrying"); + error(_("^No data input after waited for data, retrying")); goto retry; } return(1); @@ -1315,28 +1429,28 @@ const char *sf,*ss; break; case '9': if (isdigit(cs)) break; - subp="digit"; + subp=_("digit"); break; case '+': if (cs=='+' || cs=='-') break; - subp="+/- sign"; + subp=_("+/- sign"); break; default: if (cf==cs) break; VARPRINTF(sub,"'%c'",cf); subp=sub; } if (!subp) continue; - VARPRINTF5(err,"Expected %s, found '%c' at pos %d of string [%s], formatstring [%s]", + VARPRINTF5(err,_("Expected %s, found '%c' at pos %d of string [%s], formatstring [%s]"), subp,cs,ss-string,string,fmt); return(err); } if (*sf) { - VARPRINTF2(err,"String too short for format, string [%s], formatstring [%s]", + VARPRINTF2(err,_("String too short for format, string [%s], formatstring [%s]"), string,fmt); return(err); } if (*ss) { - VARPRINTF2(err,"Trailing garbage in string [%s], formatstring [%s]", + VARPRINTF2(err,_("Trailing garbage in string [%s], formatstring [%s]"), string,fmt); return(err); } @@ -1358,12 +1472,12 @@ static const struct { const char *name; } timeparse[]={ #define TP_ENT(a,b,c,d,e) { a,offsetof(struct tm,b),c,d,e } - TP_ENT( 3,tm_year,0,99,"year"), - TP_ENT( 6,tm_mon ,1,12,"month"), - TP_ENT( 9,tm_mday,1,31,"day of month"), - TP_ENT(12,tm_hour,0,23,"hour"), - TP_ENT(15,tm_min ,0,59,"minute"), - TP_ENT(18,tm_sec ,0,59,"second"), + TP_ENT( 3,tm_year,0,99,N_("year")), + TP_ENT( 6,tm_mon ,1,12,N_("month")), + TP_ENT( 9,tm_mday,1,31,N_("day of month")), + TP_ENT(12,tm_hour,0,23,N_("hour")), + TP_ENT(15,tm_min ,0,59,N_("minute")), + TP_ENT(18,tm_sec ,0,59,N_("second")), /* Time zone ignored */ }; int i,val; @@ -1372,12 +1486,12 @@ int i,val; for (s=buf;*s==' ';s++); if (*s++!='"') { - error("Cannot find initial '\"' in CMT header: %s",buf); + error(_("Cannot find initial '\"' in CMT header: %s"),buf); return(0); } for (s1=s;*s && *s!='"';s++); if (!*s) { - error("Only one '\"' found in CMT header: %s",buf); + error(_("Only one '\"' found in CMT header: %s"),buf); return(0); } free(receive_number); @@ -1386,15 +1500,15 @@ int i,val; s++; if ((err=check_phone(receive_number)) || (err=check_format(",,\"99/99/99,99:99:99+99\"",s))) { - error("%s in CMT header: %s",err,buf); + error(_("%s in CMT header: %s"),err,buf); return(0); } memset(&tm,0,sizeof(tm)); /* may be redundant */ for (i=0;itimeparse[i].max) { - error("Weird value of %s, is %d but expected %d..%d, setting to %d", - timeparse[i].name,val,timeparse[i].min,timeparse[i].max,timeparse[i].min); + error(_("Weird value of %s, is %d but expected %d..%d, setting to %d"), + _(timeparse[i].name),val,timeparse[i].min,timeparse[i].max,timeparse[i].min); val=timeparse[i].min; } *(int *)(((char *)&tm)+timeparse[i].tmpos)=val; @@ -1404,7 +1518,7 @@ int i,val; d7("mktime(y%dm%dd%dh%dm%ds%d)\n", tm.tm_year,tm.tm_mon,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec); if ((receive_time=mktime(&tm))==-1) { - error("^mktime(3) failed for %s",s+2); + error(_("^mktime(3) failed for %s"),s+2); return(0); } return(1); @@ -1427,7 +1541,7 @@ FILE *f; #endif if (pid>0) return; /* parent context */ if (pid==-1) { - error("Can't fork(2), process spawning may block receive"); + error(_("Can't fork(2), process spawning may block receive")); } else { /* child process */ dis_cleanup=1; @@ -1455,7 +1569,7 @@ FILE *f; break; case 't': if (!(s2=ctime(&receive_time))) { - error("Failing ctime(3), ignoring substitution"); + error(_("Failing ctime(3), ignoring substitution")); break; } if ((s3=strchr(s2,'\n'))) *s3='\0'; @@ -1466,13 +1580,13 @@ FILE *f; } buf=glueargstack(NULL,NULL); assert(buf); if (!(f=popen(buf,"w"))) { - error("^Failing spawn of receive command: %s",buf); + error(_("^Failing spawn of receive command: %s"),buf); goto err; } if (fputs(bodyline,f)<0 || putc('\n',f)!='\n') - error("^Failing write to child receive command: %s",buf); + error(_("^Failing write to child receive command: %s"),buf); if ((i=pclose(f))) - error("^Spawned receive command failure (code %d): %s",i,buf); + error(_("^Spawned receive command failure (code %d): %s"),i,buf); err: free(buf); if (pid==-1) return; @@ -1496,14 +1610,23 @@ int main(int argc,char **argv) char *s; int i; unsigned fatal=0; -speed_t portbaud; +speed_t portbaud=0 /* GCC happiness */; enum modenum argsmode; if ((s=strrchr((pname=*argv),'/'))) pname=s+1; + +#ifdef ENABLE_NLS + /* Initialize the i18n stuff */ + bindtextdomain(PACKAGE,LOCALEDIR); + if (!setlocale(LC_ALL,"")) + error("Locale not supported by C library"); + textdomain(PACKAGE); +#endif + #ifdef HAVE_ATEXIT atexit(cleanup); #else - error("atexit(3) not available at compilation time, device cleanup may be missed"); + error(_("atexit(3) not available at compilation time, device cleanup may be missed")); #endif signal(SIGTERM,(RETSIGTYPE (*)(int))cleanup); signal(SIGQUIT,(RETSIGTYPE (*)(int))cleanup); @@ -1513,7 +1636,7 @@ enum modenum argsmode; for (i=0;i"); + processargs(argc,argv,_("")); if ((s=getenv("HOME"))) { size_t l=strlen(s); char *buf=malloc(l+50); @@ -1534,19 +1657,20 @@ char *buf=malloc(l+50); readfile(CONFIG_MAIN,1); if (verbose>=1) { if (argsmode) - error(".Detected mode \"%s\" from my program name \"%s\"",MODE_NAME(argsmode),pname); + error(_(".Detected mode \"%s\" from my program name \"%s\""),MODE_NAME(argsmode),pname); else - error(".Automatic mode detection unsuccessul for my progam name \"%s\"",pname); + error(_(".Automatic mode detection unsuccessul for my progam name \"%s\""),pname); } if (!mode) - error("!Operation mode unset, use --send or similiar command, see help (-h)"); - error(".Running program in mode \"%s\"",MODE_NAME(mode)); + error(_("!Operation mode unset, use --send or similiar command, see help (-h)")); + error(_(".Running program in mode \"%s\""),MODE_NAME(mode)); switch (mode) { case MODE_SEND: /* FALLTHRU */ case MODE_SEND_MOBILDOCK: cmdline_send (); break; case MODE_LOGO_SEND: cmdline_logo_send(); break; + case MODE_RING_SEND: cmdline_ring_send(); break; case MODE_RECEIVE: cmdline_receive (); break; default: assert(0); } @@ -1556,10 +1680,10 @@ const struct nullcheck *n=nullcheck+i; if (*n->var) continue; if (n->reqd && !(MODE_BIT(mode)&n->reqd)) continue; - error("Missing parameter \"%s\"",n->name); + error(_("Missing parameter \"%s\""),_(n->name)); fatal++; } - if (fatal) error("!Previous error%s considered unrecoverable",(fatal==1?"":"s")); + if (fatal) error(_("!Previous %s considered unrecoverable"),(fatal==1?_("error"):_("errors"))); emptyclean(); if (!logname) logname=DEF_LOGNAME; if (!lockfile) lockfile=DEF_LOCKFILE; @@ -1570,7 +1694,7 @@ char *serr; if (!*numarg[i].sp) continue; *numarg[i].ip=strtol(*numarg[i].sp,&serr,0); if (*numarg[i].ip<0 || *numarg[i].ip>=LONG_MAX || !serr || *serr) - error("!Number parse error for parameter \"%s\" of \"%s\" at: %s", + error(_("!Number parse error for parameter \"%s\" of \"%s\" at: %s"), numarg[i].msg,*numarg[i].sp,serr); } if (readtimen==-1) @@ -1591,16 +1715,16 @@ size_t l=strlen(device); s++; if (*s=='%') continue; if (*s=='s') { - if (i) error("!Only one \"%%s\" permitted in lockfile format-string"); + if (i) error(_("!Only one \"%%s\" permitted in lockfile format-string")); i=1; continue; } - error("!Invalid format-character '%c' in lockfile format-string, only \"%%s\" allowed",*s); + error(_("!Invalid format-character '%c' in lockfile format-string, only \"%%s\" allowed"),*s); } if (*logname) { if (!(logf=fopen(logname,"a"))) - error("^!Error opening log \"%s\" for append",logname); - logmsg("Starting up: " PACKAGE " " VERSION); + error(_("^!Error opening log \"%s\" for append"),logname); + logmsg(_("Starting up: %s"),PACKAGE " " VERSION); } switch (mode) { @@ -1612,11 +1736,14 @@ size_t l=strlen(device); case MODE_LOGO_SEND: logoread(); break; + case MODE_RING_SEND: + ringread(); + break; case MODE_RECEIVE: break; default: assert(0); } if (readbody) - error("Warning: -f / --file is forbidden with mode \"%s\"",MODE_NAME(mode)); + error(_("Warning: -f / --file is forbidden with mode \"%s\""),MODE_NAME(mode)); switch (baudn) { case 2400: portbaud= B2400; break; @@ -1626,25 +1753,25 @@ size_t l=strlen(device); case 38400: portbaud=B38400; break; case 57600: portbaud=B57600; break; default: - error("!Specified baudrate %ld is not supported",baudn); + error(_("!Specified baudrate %ld is not supported"),baudn); } - if (verbose>=2) error(".Will use baudrate %ld with hexval 0x%X",baudn,portbaud); + if (verbose>=2) error(_(".Will use baudrate %ld with hexval 0x%X"),baudn,portbaud); if (lockfile && *lockfile && VARPRINTF(lockreal,lockfile,devicename)>0) { time_t start,end; - if (verbose>=1) error(".Locking device \"%s\" by \"%s\"..",device,lockreal); + if (verbose>=1) error(_(".Locking device \"%s\" by \"%s\".."),device,lockreal); time(&start); lockdevice(0); time(&end); if ((end-=start)>LOCKREPORT) - logmsg("Device lock succeeded after %ld seconds",(long)end); + logmsg(_("Device lock succeeded after %ld seconds"),(long)end); } - if (verbose>=1) error(".Opening device \"%s\"..",device); + if (verbose>=1) error(_(".Opening device \"%s\".."),device); if ((devfd=open(device,O_RDWR|O_NDELAY))<0) - error("^!Cannot open device \"%s\" for r/w access",device); + error(_("^!Cannot open device \"%s\" for r/w access"),device); if (tcgetattr(devfd,&restios)) - error("^Unable to get termios settings"); + error(_("^Unable to get termios settings")); else { restios.c_cflag=(restios.c_cflag&~(CBAUD|CBAUDEX))|B0|HUPCL; restios_yes=1; @@ -1658,11 +1785,11 @@ time_t start,end; tios.c_cc[VMIN ]=1; cfsetispeed(&tios,portbaud); if (cfsetospeed(&tios,portbaud)|cfsetispeed(&tios,portbaud)) - error("^Error setting termios baudrate on device"); + error(_("^Error setting termios baudrate on device")); if (tcflush(devfd,TCIOFLUSH)) - error("^Error flushing termios (TCIOFLUSH) on device"); + error(_("^Error flushing termios (TCIOFLUSH) on device")); if (tcsetattr(devfd,TCSANOW,&tios)) - error("^!Unable to set initial termios device settings"); + error(_("^!Unable to set initial termios device settings")); setalarm(); @@ -1687,19 +1814,27 @@ retrysendcmgf: } break; case MODE_LOGO_SEND: + case MODE_RING_SEND: { +struct hexdata *hd; + restore="\r\nAT+CSMP=17,,0,0"; devcmd(NULL,NULL,"\r\nAT+CSMP=81,,0,245"); devcmd("\n> ",NULL,"\r\nAT+CMGS=\"%s\"",phone); - s=devcmd(NULL,"\n+CMGS:","!~%s\032",hexdata); - break; + while ((hd=hexdata)) { + if (!(s=devcmd(NULL,"\n+CMGS:","!~%s\032",hd->data))) break; + hexdata=hd->next; + free(hd); + } + } break; case MODE_RECEIVE: devcmd(NULL,NULL,"\r\nAT+CMGF=1"); restore="\r\nAT+CNMI=,0"; + devcmd(NULL,NULL,"\r\nAT+CSDH=0"); devcmd(NULL,NULL,"\r\nAT+CNMI=,2"); unlockdevice(0); /* Never bail-out when we got up to this point */ if (maxretryn!=-1 && verbose>=1) - error(".Initialization successful, infinite retry count set"); + error(_(".Initialization successful, infinite retry count set")); maxretryn=-1; #if RECEIVE_TEST receive_headerparse(" \"+420602123456\",,\"99/10/25,03:21:03-00\""); @@ -1709,18 +1844,18 @@ retrysendcmgf: datawait(0); if (!lockdevice(1)) { if (verbose>=1) - error(".Dialout detected, waiting for lock.."); + error(_(".Dialout detected, waiting for lock..")); lockdevice(0); goto retryall; } d1("Lock-device succeeded\n"); do { d1("Reading a message for us...\n"); - if (!(s=devcmd("\r","+CMT:"," "))) + if (!(s=devcmd("\r","@+CMT:"," "))) goto retryall; if (!(i=receive_headerparse(s))) - error("Receive-header parsing failed on: %s",s); - if (!(s=devcmd("\r","\n"," "))) + error(_("Receive-header parsing failed on: %s"),s); + if (!(s=devcmd("\r","@\n"," "))) goto retryall; if (i) receive_accept(s); if (!devcmd("\n",NULL," ")) /* eat last '\n' */ @@ -1733,9 +1868,9 @@ retrysendcmgf: if (!s) { retrying(); goto retryall; } while (isspace(*s)) s++; - if (verbose>=1) error("\nMessage successfuly sent with MR: %s",s); + if (verbose>=1) error(_("\nMessage successfuly sent with MR (Message Reference): %s"),s); devcmd(NULL,NULL,"\r\nAT"); - logmsg("SMS sent (after %d retries), message reference: %s",retrycnt,s); + logmsg(_("SMS sent (after %d retries), message reference: %s"),retrycnt,s); return(EXIT_SUCCESS); }