This commit was manufactured by cvs2svn to create tag 'bp_uc'.

[gnokii.git] / gnokii / gnokii.c

diff --git a/gnokii/gnokii.c b/gnokii/gnokii.c
index 4da6169..65d8227 100644 (file)
--- a/gnokii/gnokii.c
+++ b/gnokii/gnokii.c
@@ -66,8 +66,6 @@
 #include "files/gsm-filetypes.h"
 #include "gnokii.h"
 
-#include "protocol/fbus.h"
-
 #ifdef USE_NLS
   #include <locale.h>
 #endif
@@ -262,6 +260,7 @@ char *print_error(GSM_Error e)
         case GE_INVALIDBOOKMARKLOCATION:  return "Invalid or empty WAP bookmark location";
         case GE_INSIDESETTINGSMENU:       return "Inside WAP Settings menu. Please leave it and try again";
         case GE_INVALIDSETTINGSLOCATION:  return "Invalid or empty WAP settings location";
+        case GE_EMPTYSMSC:                return "Empty SMSC number. Use --smsc";
        default:                          return "Unknown error.";
        }
 }
@@ -455,8 +454,8 @@ int GSM_SendMultiPartSMSOnConsole(GSM_MultiSMSMessage *MultiSMS, int argnum, int
   int w,i;
   
   struct option options[] = {
-             { "smscno",       required_argument, NULL, '1'},
-             { "smsc",         required_argument, NULL, '2'},
+             { "smscno",       required_argument, NULL, '2'},
+             { "smsc",         required_argument, NULL, '1'},
             { "name",         required_argument, NULL, '3'},
              { "unicode",      no_argument,       NULL, '4'},
              { "profilestyle", no_argument,       NULL, '5'},
@@ -529,7 +528,7 @@ int GSM_SendMultiPartSMSOnConsole(GSM_MultiSMSMessage *MultiSMS, int argnum, int
     if (error == GE_SMSSENDOK) {
       fprintf(stdout, _("SMS %i/%i sent OK !\n"),w+1,MultiSMS->number);
     } else {
-      fprintf(stdout, _("SMS %i/%i, sending failed (error=%d)\n"),w+1,MultiSMS->number, error);
+      fprintf(stdout, _("SMS %i/%i, sending failed (%d, %s)\n"),w+1,MultiSMS->number, error,print_error(error));
     }
 
   }
@@ -547,8 +546,8 @@ int GSM_SaveMultiPartSMSOnConsole(GSM_MultiSMSMessage *MultiSMS, int argnum, int
   GSM_SMSMessage SMSold;
 
   struct option options[] = {
-             { "smscno",       required_argument, NULL, '1'},
-             { "smsc",         required_argument, NULL, '2'},
+             { "smscno",       required_argument, NULL, '2'},
+             { "smsc",         required_argument, NULL, '1'},
             { "name",         required_argument, NULL, '3'},
              { "unicode",      no_argument,       NULL, '4'},
              { "profilestyle", no_argument,       NULL, '5'},
@@ -657,7 +656,7 @@ int GSM_SaveMultiPartSMSOnConsole(GSM_MultiSMSMessage *MultiSMS, int argnum, int
     if (error == GE_NONE)
       fprintf(stdout, _("SMS %i/%i saved at location %i !\n"),w+1,MultiSMS->number,MultiSMS->SMS[w].MessageNumber);
     else
-      fprintf(stdout, _("SMS %i/%i saving failed (error=%d, location=%i)\n"), w+1, MultiSMS->number, error,MultiSMS->SMS[w].Location);
+      fprintf(stdout, _("SMS %i/%i saving failed (%d, %s, location=%i)\n"), w+1, MultiSMS->number,error,print_error(error),MultiSMS->SMS[w].Location);
   }
 
   GSM->Terminate();  
@@ -1644,8 +1643,8 @@ int sendsms(int argc, char *argv[])
   GSM_UDH SMSUDHType=GSM_NoUDH;
 
   struct option options[] = {
-             { "smscno",       required_argument, NULL, '1'},
-             { "smsc",         required_argument, NULL, '2'},
+             { "smscno",       required_argument, NULL, '2'},
+             { "smsc",         required_argument, NULL, '1'},
              { "long",        required_argument, NULL, '3'},
              { "enablevoice",  no_argument,       NULL, '4'},
             { "disablevoice", no_argument,       NULL, '5'},
@@ -1830,8 +1829,8 @@ int savesms(int argc, char *argv[])
   bool interactive=false;
 
   struct option options[] = {
-             { "smscno",       required_argument, NULL, '1'},
-             { "smsc",         required_argument, NULL, '2'},
+             { "smscno",       required_argument, NULL, '2'},
+             { "smsc",         required_argument, NULL, '1'},
              { "long",        required_argument, NULL, '3'},
              { "enablevoice",  no_argument,       NULL, '4'},
             { "disablevoice", no_argument,       NULL, '5'},
@@ -7515,31 +7514,20 @@ int decodefile(int argc, char *argv[])
  int i = 0;
 
   /* base model comes from gnokiirc */
-#if 0
   strcat(model,"decode");
-#else
-  strcpy(model,"5190sniff");
-  fbus_decoding=1;
-#endif
 
  /* Initialise the GSM interface. */
  fbusinit(NULL);
 
- printf ("open InPutFile: %s\n\n\n", argv[0]);
+ printf ("open InPutFile: %s\n", argv[0]);
  if ( (infile = fopen( argv[0], "rb")) == NULL ) {
    printf ("Failed to open InPutFile: %s\n", argv[0]);
    exit (1); }
 
  while ( (nr_read = fread(in_buffer, 1, 16, infile)) > 0 ) {
-static int last=0;
-       if (ftell(infile)>last+1000) {
-               last=ftell(infile);
-               printf("ftell=%d\n",last);
-               }
   for (i=0; i < nr_read; i++)
      Protocol->StateMachine(in_buffer[i]);
   }
-   puts("gnokii/decodefile() done");
 
    return 0;
 }