X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;ds=sidebyside;f=gnokii%2Fgnokii.c;fp=gnokii%2Fgnokii.c;h=df3ce22df724c0741d3c177a43b2083d51d84358;hb=81b1712d54efa46b3148a5beb42d32d7632ef30c;hp=d9030f78b7e7a77b8c464a6952bc7d233fbeab2c;hpb=28c1f486126d510c51033eea2385d61a11ebe789;p=gnokii.git diff --git a/gnokii/gnokii.c b/gnokii/gnokii.c index d9030f7..df3ce22 100644 --- a/gnokii/gnokii.c +++ b/gnokii/gnokii.c @@ -1238,6 +1238,8 @@ int main(int argc, char *argv[]) { 0, 0, 0, 0 }, }; + LIVE; + opterr = 0; /* For GNU gettext */ @@ -4672,6 +4674,7 @@ static int getmemory(int argc, char *argv[]) fprintf(stderr, _("Unknown memory type %s!\n"), argv[0]); return (-1); } + GetMemoryTypeString(memory_type_string, &entry.MemoryType); if (argv[argc-1][0] == '-') @@ -5231,20 +5234,29 @@ static int identify( void ) /* Hopefully is 64 larger as FB38_MAX* / FB61_MAX* */ char imei[64], model[64], rev[64], manufacturer[64]; + LIVE; fbusinit(NULL); + LIVE; while (GSM->GetIMEI(imei) != GE_NONE) sleep(1); + LIVE; while (GSM->GetRevision(rev) != GE_NONE) sleep(1); + LIVE; while (GSM->GetModel(model) != GE_NONE) sleep(1); + LIVE; strcpy(manufacturer, "(unknown)"); + LIVE; GSM->GetManufacturer(manufacturer); + LIVE; fprintf(stdout, _("IMEI: %s\n"), imei); fprintf(stdout, _("Model: %s %s (%s)\n"), manufacturer, GetModelName (model), model); fprintf(stdout, _("Revision: %s\n"), rev); + LIVE; GSM->Terminate(); + LIVE; return 0; }