~drizzle-trunk/drizzle/development

_("Enable named commands. Named commands mean this program's internal commands; see drizzle> help . When enabled, the named commands can be used from any line of the query, otherwise only from the first line, before an enter."))

1301

N_("Enable named commands. Named commands mean this program's internal commands; see drizzle> help . When enabled, the named commands can be used from any line of the query, otherwise only from the first line, before an enter."))

1347

1302

("no-beep,b", po::value<bool>(&opt_nobeep)->default_value(false)->zero_tokens(),

1348

_("Turn off beep on error."))

1349

("disable-line-numbers", _("Do not write line numbers for errors."))

1350

("disable-column-names", _("Do not write column names in results."))

1303

N_("Turn off beep on error."))

1304

("disable-line-numbers", N_("Do not write line numbers for errors."))

1305

("disable-column-names", N_("Do not write column names in results."))

1351

1306

("skip-column-names,N",

1352

_("Don't write column names in results. WARNING: -N is deprecated, use long version of this options instead."))

1307

N_("Don't write column names in results. WARNING: -N is deprecated, use long version of this options instead."))

1353

1308

("set-variable,O", po::value<string>(),

1354

_("Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value."))

1309

N_("Change the value of a variable. Please note that this option is deprecated; you can set variables directly with --variable-name=value."))

1355

1310

("table,t", po::value<bool>(&output_tables)->default_value(false)->zero_tokens(),

1356

_("Output in table format."))

1311

N_("Output in table format."))

1357

1312

("safe-updates,U", po::value<bool>(&safe_updates)->default_value(false)->zero_tokens(),

1358

_("Only allow UPDATE and DELETE that uses keys."))

1313

N_("Only allow UPDATE and DELETE that uses keys."))

1359

1314

("i-am-a-dummy,U", po::value<bool>(&safe_updates)->default_value(false)->zero_tokens(),

1360

_("Synonym for option --safe-updates, -U."))

1315

N_("Synonym for option --safe-updates, -U."))

1361

1316

("verbose,v", po::value<string>(&opt_verbose)->default_value(""),

1362

_("-v vvv implies that verbose= 3, Used to specify verbose"))

1363

("version,V", _("Output version information and exit."))

1317

N_("-v vvv implies that verbose= 3, Used to specify verbose"))

1318

("version,V", N_("Output version information and exit."))

1364

1319

("secure-auth", po::value<bool>(&opt_secure_auth)->default_value(false)->zero_tokens(),

1365

_("Refuse client connecting to server if it uses old (pre-4.1.1) protocol"))

1320

N_("Refuse client connecting to server if it uses old (pre-4.1.1) protocol"))

1366

1321

("show-warnings", po::value<bool>(&show_warnings)->default_value(false)->zero_tokens(),

1367

_("Show warnings after every statement."))

1322

N_("Show warnings after every statement."))

1368

1323

("show-progress-size", po::value<uint32_t>(&show_progress_size)->default_value(0),

1369

_("Number of lines before each import progress report."))

1324

N_("Number of lines before each import progress report."))

1370

1325

("ping", po::value<bool>(&opt_ping)->default_value(false)->zero_tokens(),

1371

_("Ping the server to check if it's alive."))

1326

N_("Ping the server to check if it's alive."))

1372

1327

("no-defaults", po::value<bool>()->default_value(false)->zero_tokens(),

1373

_("Configuration file defaults are not used if no-defaults is set"))

1328

N_("Configuration file defaults are not used if no-defaults is set"))

1374

1329

;

1375

1330

1376

po::options_description drizzle_options(_("Options specific to the drizzle client"));

1331

po::options_description drizzle_options(N_("Options specific to the drizzle client"));

1377

1332

drizzle_options.add_options()

1378

1333

("disable-auto-rehash,A",

1379

_("Disable automatic rehashing. One doesn't need to use 'rehash' to get table and field completion, but startup and reconnecting may take a longer time."))

1334

N_("Disable automatic rehashing. One doesn't need to use 'rehash' to get table and field completion, but startup and reconnecting may take a longer time."))

1380

1335

("auto-vertical-output", po::value<bool>(&auto_vertical_output)->default_value(false)->zero_tokens(),

1381

_("Automatically switch to vertical output mode if the result is wider than the terminal width."))

1336

N_("Automatically switch to vertical output mode if the result is wider than the terminal width."))

1382

1337

("database,D", po::value<string>(&current_db)->default_value(""),

1383

_("Database to use."))

1338

N_("Database to use."))

1384

1339

("default-character-set",po::value<string>(),

1385

_("(not used)"))

1340

N_("(not used)"))

1386

1341

("delimiter", po::value<string>(&delimiter_str)->default_value(";"),

1387

_("Delimiter to be used."))

1342

N_("Delimiter to be used."))

1388

1343

("execute,e", po::value<string>(),

1389

_("Execute command and quit. (Disables --force and history file)"))

1344

N_("Execute command and quit. (Disables --force and history file)"))

1390

1345

("local-infile", po::value<bool>(&opt_local_infile)->default_value(false)->zero_tokens(),

1391

_("Enable LOAD DATA LOCAL INFILE."))

1346

N_("Enable LOAD DATA LOCAL INFILE."))

1392

1347

("unbuffered,n", po::value<bool>(&unbuffered)->default_value(false)->zero_tokens(),

1393

_("Flush buffer after each query."))

1348

N_("Flush buffer after each query."))

1394

1349

("sigint-ignore", po::value<bool>(&opt_sigint_ignore)->default_value(false)->zero_tokens(),

1395

_("Ignore SIGINT (CTRL-C)"))

1350

N_("Ignore SIGINT (CTRL-C)"))

1396

1351

("one-database,o", po::value<bool>(&one_database)->default_value(false)->zero_tokens(),

1397

_("Only update the default database. This is useful for skipping updates to other database in the update log."))

1352

N_("Only update the default database. This is useful for skipping updates to other database in the update log."))

1398

1353

("pager", po::value<string>(),

1399

_("Pager to use to display results. If you don't supply an option the default pager is taken from your ENV variable PAGER. Valid pagers are less, more, cat [> filename], etc. See interactive help (\\h) also. This option does not work in batch mode. Disable with --disable-pager. This option is disabled by default."))

1354

N_("Pager to use to display results. If you don't supply an option the default pager is taken from your ENV variable PAGER. Valid pagers are less, more, cat [> filename], etc. See interactive help (\\h) also. This option does not work in batch mode. Disable with --disable-pager. This option is disabled by default."))

1400

1355

("disable-pager", po::value<bool>(&opt_nopager)->default_value(false)->zero_tokens(),

1401

_("Disable pager and print to stdout. See interactive help (\\h) also."))

1356

N_("Disable pager and print to stdout. See interactive help (\\h) also."))

1402

1357

("prompt", po::value<string>(&current_prompt)->default_value(""),

1403

_("Set the drizzle prompt to this value."))

1358

N_("Set the drizzle prompt to this value."))

1404

1359

("quick,q", po::value<bool>(&quick)->default_value(false)->zero_tokens(),

1405

_("Don't cache result, print it row by row. This may slow down the server if the output is suspended. Doesn't use history file."))

1360

N_("Don't cache result, print it row by row. This may slow down the server if the output is suspended. Doesn't use history file."))

1406

1361

("raw,r", po::value<bool>(&opt_raw_data)->default_value(false)->zero_tokens(),

1407

_("Write fields without conversion. Used with --batch."))

1408

("disable-reconnect", _("Do not reconnect if the connection is lost."))

1362

N_("Write fields without conversion. Used with --batch."))

1363

("disable-reconnect", N_("Do not reconnect if the connection is lost."))

1409

1364

("shutdown", po::value<bool>()->zero_tokens(),

1410

_("Shutdown the server"))

1411

("silent,s", _("Be more silent. Print results with a tab as separator, each row on new line."))

1365

N_("Shutdown the server"))

1366

("silent,s", N_("Be more silent. Print results with a tab as separator, each row on new line."))

1412

1367

("tee", po::value<string>(),

1413

_("Append everything into outfile. See interactive help (\\h) also. Does not work in batch mode. Disable with --disable-tee. This option is disabled by default."))

1368

N_("Append everything into outfile. See interactive help (\\h) also. Does not work in batch mode. Disable with --disable-tee. This option is disabled by default."))

1414

1369

("disable-tee", po::value<bool>()->default_value(false)->zero_tokens(),

1415

_("Disable outfile. See interactive help (\\h) also."))

1370

N_("Disable outfile. See interactive help (\\h) also."))

1416

1371

("connect-timeout", po::value<uint32_t>(&opt_connect_timeout)->default_value(0)->notifier(&check_timeout_value),

1417

_("Number of seconds before connection timeout."))

1372

N_("Number of seconds before connection timeout."))

1418

1373

("max-input-line", po::value<uint32_t>(&opt_max_input_line)->default_value(16*1024L*1024L)->notifier(&check_max_input_line),

1419

_("Max length of input line"))

1374

N_("Max length of input line"))

1420

1375

("select-limit", po::value<uint32_t>(&select_limit)->default_value(1000L),

1421

_("Automatic limit for SELECT when using --safe-updates"))

1376

N_("Automatic limit for SELECT when using --safe-updates"))

1422

1377

("max-join-size", po::value<uint32_t>(&max_join_size)->default_value(1000000L),

1423

_("Automatic limit for rows in a join when using --safe-updates"))

1378

N_("Automatic limit for rows in a join when using --safe-updates"))

1424

1379

;

1425

1380

1426

po::options_description client_options(_("Options specific to the client"));

1381

po::options_description client_options(N_("Options specific to the client"));

1427

1382

client_options.add_options()

1428

1383

("host,h", po::value<string>(&current_host)->default_value("localhost"),

1429

_("Connect to host"))

1384

N_("Connect to host"))

1430

1385

("password,P", po::value<string>(&current_password)->default_value(PASSWORD_SENTINEL),

1431

_("Password to use when connecting to server. If password is not given it's asked from the tty."))

1386

N_("Password to use when connecting to server. If password is not given it's asked from the tty."))

1432

1387

("port,p", po::value<uint32_t>()->default_value(0),

1433

_("Port number to use for connection or 0 for default to, in order of preference, drizzle.cnf, $DRIZZLE_TCP_PORT, built-in default"))

1388

N_("Port number to use for connection or 0 for default to, in order of preference, drizzle.cnf, $DRIZZLE_TCP_PORT, built-in default"))

1434

1389

#ifdef DRIZZLE_ADMIN_TOOL

1435

1390

("user,u", po::value<string>(&current_user)->default_value("root"),

1436

1391

#else

1437

1392

("user,u", po::value<string>(&current_user)->default_value(""),

1438

1393

#endif

1439

_("User for login if not current user."))

1394

N_("User for login if not current user."))

1440

1395

("protocol",po::value<string>(&opt_protocol)->default_value("mysql"),

1441

_("The protocol of connection (mysql or drizzle)."))

1396

N_("The protocol of connection (mysql or drizzle)."))

1442

1397

;

1443

1398

1444

po::options_description long_options(_("Allowed Options"));

1399

po::options_description long_options(N_("Allowed Options"));

1445

1400

long_options.add(commandline_options).add(drizzle_options).add(client_options);

1446

1401

1447

1402

std::string system_config_dir_drizzle(SYSCONFDIR);

1510

1465

"prompt. Aborting.\n"));

1511

1466

exit(ENOMEM);

1512

1467

}

1513

1514

if (current_prompt.empty())

1515

current_prompt= strdup(default_prompt);

1516

1468

current_prompt= strdup(default_prompt);

1517

1469

if (current_prompt.empty())

1518

1470

{

1519

1471

fprintf(stderr, _("Memory allocation error while constructing initial "

1538

1490

if (! isatty(0) || ! isatty(1))

1539

1491

{

1540

1492

status.setBatch(1); opt_silent=1;

1493

ignore_errors=0;

1541

1494

}

1542

1495

else

1543

1496

status.setAddToHistory(1);

1714

1667

}

1715

1668

if (vm.count("silent"))

1716

1669

{

1717

opt_silent= 2;

1670

opt_silent++;

1718

1671

}

1719

1672

1720

1673

if (vm.count("help") || vm.count("version"))

1742

1695

}

1743

1696

1744

1697

memset(&drizzle, 0, sizeof(drizzle));

1745

if (sql_connect(current_host, current_db, current_user, opt_password))

1698

if (sql_connect(current_host, current_db, current_user, opt_password,opt_silent))

1746

1699

{

1747

1700

quick= 1; // Avoid history

1748

1701

status.setExitStatus(1);

2762

2715

static int

2763

2716

com_help(string *buffer, const char *)

2764

2717

{

2765

int i, j;

2718

2766

2719

char buff[32], *end;

2767

2720

std::vector<char> output_buff;

2768

2721

output_buff.resize(512);

2811

2764

com_go(string *buffer, const char *)

2812

2765

{

2813

2766

char buff[200]; /* about 110 chars used so far */

2767

char time_buff[52+3+1]; /* time max + space&parens + NUL */

2814

2768

drizzle_result_st result;

2815

2769

drizzle_return_t ret;

2816

uint32_t warnings= 0;

2817

boost::posix_time::ptime timer;

2770

uint32_t timer, warnings= 0;

2818

2771

uint32_t error= 0;

2819

2772

uint32_t error_code= 0;

2820

2773

int err= 0;

2883

2836

goto end;

2884

2837

}

2885

2838

2886

string time_buff("");

2887

2839

if (verbose >= 3 || !opt_silent)

2888

2840

drizzle_end_timer(timer,time_buff);

2841

else

2842

time_buff[0]= '\0';

2889

2843

2890

2844

/* Every branch must truncate buff . */

2891

2845

if (drizzle_result_column_count(&result) > 0)

2936

2890

if (warnings != 1)

2937

2891

*pos++= 's';

2938

2892

}

2939

strcpy(pos, time_buff.c_str());

2893

strcpy(pos, time_buff);

2940

2894

put_info(buff,INFO_RESULT,0,0);

2941

2895

if (strcmp(drizzle_result_info(&result), ""))

2942

2896

put_info(drizzle_result_info(&result),INFO_RESULT,0,0);

3130

3084

drizzle_return_t ret;

3131

3085

drizzle_column_st *field;

3132

3086

std::vector<bool> num_flag;

3133

std::vector<bool> boolean_flag;

3134

std::vector<bool> ansi_boolean_flag;

3135

3087

string separator;

3136

3088

3137

3089

separator.reserve(256);

3138

3090

3139

3091

num_flag.resize(drizzle_result_column_count(result));

3140

boolean_flag.resize(drizzle_result_column_count(result));

3141

ansi_boolean_flag.resize(drizzle_result_column_count(result));

3142

3092

if (column_types_flag)

3143

3093

{

3144

3094

print_field_types(result);

3181

3131

// Room for "NULL"

3182

3132

length=4;

3183

3133

}

3184

if ((length < 5) and

3185

(server_type == ServerDetect::SERVER_DRIZZLE_FOUND) and

3186

(drizzle_column_type(field) == DRIZZLE_COLUMN_TYPE_TINY) and

3187

(drizzle_column_type(field) & DRIZZLE_COLUMN_FLAGS_UNSIGNED))

3188

{

3189

// Room for "FALSE"

3190

length= 5;

3191

}

3192

3134

drizzle_column_set_max_size(field, length);

3193

3135

3194

3136

for (x=0; x< (length+2); x++)

3212

3154

drizzle_column_name(field));

3213

3155

num_flag[off]= ((drizzle_column_type(field) <= DRIZZLE_COLUMN_TYPE_LONGLONG) ||

3214

3156

(drizzle_column_type(field) == DRIZZLE_COLUMN_TYPE_NEWDECIMAL));

3215

if ((server_type == ServerDetect::SERVER_DRIZZLE_FOUND) and

3216

(drizzle_column_type(field) == DRIZZLE_COLUMN_TYPE_TINY))

3217

{

3218

if ((drizzle_column_flags(field) & DRIZZLE_COLUMN_FLAGS_UNSIGNED))

3219

{

3220

ansi_boolean_flag[off]= true;

3221

}

3222

else

3223

{

3224

ansi_boolean_flag[off]= false;

3225

}

3226

boolean_flag[off]= true;

3227

num_flag[off]= false;

3228

}

3229

else

3230

{

3231

boolean_flag[off]= false;

3232

}

3233

3157

}

3234

3158

(void) tee_fputs("\n", PAGER);

3235

3159

tee_puts((char*) separator.c_str(), PAGER);

3268

3192

buffer= "NULL";

3269

3193

data_length= 4;

3270

3194

}

3271

else if (boolean_flag[off])

3272

{

3273

if (strncmp(cur[off],"1", 1) == 0)

3274

{

3275

if (ansi_boolean_flag[off])

3276

{

3277

buffer= "YES";

3278

data_length= 3;

3279

}

3280

else

3281

{

3282

buffer= "TRUE";

3283

data_length= 4;

3284

}

3285

}

3286

else

3287

{

3288

if (ansi_boolean_flag[off])

3289

{

3290

buffer= "NO";

3291

data_length= 2;

3292

}

3293

else

3294

{

3295

buffer= "FALSE";

3296

data_length= 5;

3297

}

3298

}

3299

}

3300

3195

else

3301

3196

{

3302

3197

buffer= cur[off];

3570

3465

drizzle_return_t ret;

3571

3466

drizzle_column_st *field;

3572

3467

size_t *lengths;

3573

std::vector<bool> boolean_flag;

3574

std::vector<bool> ansi_boolean_flag;

3575

3576

boolean_flag.resize(drizzle_result_column_count(result));

3577

ansi_boolean_flag.resize(drizzle_result_column_count(result));

3578

3579

int first=0;

3580

for (uint32_t off= 0; (field = drizzle_column_next(result)); off++)

3468

3469

if (opt_silent < 2 && column_names)

3581

3470

{

3582

if (opt_silent < 2 && column_names)

3471

int first=0;

3472

while ((field = drizzle_column_next(result)))

3583

3473

{

3584

3474

if (first++)

3585

3475

(void) tee_fputs("\t", PAGER);

3586

3476

(void) tee_fputs(drizzle_column_name(field), PAGER);

3587

3477

}

3588

if ((server_type == ServerDetect::SERVER_DRIZZLE_FOUND) and

3589

(drizzle_column_type(field) == DRIZZLE_COLUMN_TYPE_TINY))

3590

{

3591

if ((drizzle_column_flags(field) & DRIZZLE_COLUMN_FLAGS_UNSIGNED))

3592

{

3593

ansi_boolean_flag[off]= true;

3594

}

3595

else

3596

{

3597

ansi_boolean_flag[off]= false;

3598

}

3599

boolean_flag[off]= true;

3600

}

3601

else

3602

{

3603

boolean_flag[off]= false;

3604

}

3605

}

3606

if (opt_silent < 2 && column_names)

3607

{

3608

3478

(void) tee_fputs("\n", PAGER);

3609

3479

}

3610

3480

while (1)

3625

3495

break;

3626

3496

3627

3497

lengths= drizzle_row_field_sizes(result);

3628

drizzle_column_seek(result, 0);

3629

for (uint32_t off=0 ; off < drizzle_result_column_count(result); off++)

3498

safe_put_field(cur[0],lengths[0]);

3499

for (uint32_t off=1 ; off < drizzle_result_column_count(result); off++)

3630

3500

{

3631

if (off != 0)

3632

(void) tee_fputs("\t", PAGER);

3633

if (boolean_flag[off])

3634

{

3635

if (strncmp(cur[off],"1", 1) == 0)

3636

{

3637

if (ansi_boolean_flag[off])

3638

{

3639

safe_put_field("YES", 3);

3640

}

3641

else

3642

{

3643

safe_put_field("TRUE", 4);

3644

}

3645

}

3646

else

3647

{

3648

if (ansi_boolean_flag[off])

3649

{

3650

safe_put_field("NO", 2);

3651

}

3652

else

3653

{

3654

safe_put_field("FALSE", 5);

3655

}

3656

}

3657

}

3658

else

3659

{

3660

safe_put_field(cur[off], lengths[off]);

3661

}

3501

(void) tee_fputs("\t", PAGER);

3502

safe_put_field(cur[off], lengths[off]);

3662

3503

}

3663

3504

(void) tee_fputs("\n", PAGER);

3664

3505

if (quick)

3854

3695

}

3855

3696

else

3856

3697

opt_rehash= 0;

3857

error=sql_connect(current_host, current_db, current_user, opt_password);

3698

error=sql_connect(current_host, current_db, current_user, opt_password,0);

3858

3699

opt_rehash= save_rehash;

3859

3700

3860

3701

if (connected)

4163

4004

4164

4005

4165

4006

static int

4166

sql_connect(const string &host, const string &database, const string &user, const string &password)

4007

sql_connect(const string &host, const string &database, const string &user, const string &password,

4008

uint32_t silent)

4167

4009

{

4168

4010

drizzle_return_t ret;

4169

4011

if (connected)

4212

4054

4213

4055

if ((ret= drizzle_con_connect(&con)) != DRIZZLE_RETURN_OK)

4214

4056

{

4215

4216

if (opt_silent < 2)

4057

if (!silent || (ret != DRIZZLE_RETURN_GETADDRINFO &&

4058

ret != DRIZZLE_RETURN_COULD_NOT_CONNECT))

4217

4059

{

4218

4060

(void) put_error(&con, NULL);

4219

4061

(void) fflush(stdout);

4223

4065

}

4224

4066

connected=1;

4225

4067

4226

ServerDetect server_detect(&con);

4227

server_type= server_detect.getServerType();

4228

4229

4068

build_completion_hash(opt_rehash, 1);

4230

4069

return 0;

4231

4070

}

4506

4345

}

4507

4346

4508

4347

#include <sys/times.h>

4348

#ifdef _SC_CLK_TCK // For mit-pthreads

4349

#undef CLOCKS_PER_SEC

4350

#define CLOCKS_PER_SEC (sysconf(_SC_CLK_TCK))

4351

#endif

4509

4352

4510

static boost::posix_time::ptime start_timer(void)

4353

static uint32_t start_timer(void)

4511

4354

{

4512

return boost::posix_time::microsec_clock::universal_time();

4355

struct tms tms_tmp;

4356

return times(&tms_tmp);

4513

4357

}

4514

4358

4515

static void nice_time(boost::posix_time::time_duration duration, string &buff)

4359

4360

/**

4361

Write as many as 52+1 bytes to buff, in the form of a legible

4362

duration of time.

4363

4364

len("4294967296 days, 23 hours, 59 minutes, 60.00 seconds") -> 52

4365

4366

static void nice_time(double sec,char *buff,bool part_second)

4516

4367

{

4368

uint32_t tmp;

4517

4369

ostringstream tmp_buff_str;

4518

4370

4519

if (duration.hours() > 0)

4520

{

4521

tmp_buff_str << duration.hours();

4522

if (duration.hours() > 1)

4371

if (sec >= 3600.0*24)

4372

{

4373

tmp=(uint32_t) floor(sec/(3600.0*24));

4374

sec-= 3600.0*24*tmp;

4375

tmp_buff_str << tmp;

4376

4377

if (tmp > 1)

4378

tmp_buff_str << " days ";

4379

else

4380

tmp_buff_str << " day ";

4381

4382

}

4383

if (sec >= 3600.0)

4384

{

4385

tmp=(uint32_t) floor(sec/3600.0);

4386

sec-=3600.0*tmp;

4387

tmp_buff_str << tmp;

4388

4389

if (tmp > 1)

4523

4390

tmp_buff_str << _(" hours ");

4524

4391

else

4525

4392

tmp_buff_str << _(" hour ");

4526

4393

}

4527

if (duration.hours() > 0 || duration.minutes() > 0)

4394

if (sec >= 60.0)

4528

4395

{

4529

tmp_buff_str << duration.minutes() << _(" min ");

4396

tmp=(uint32_t) floor(sec/60.0);

4397

sec-=60.0*tmp;

4398

tmp_buff_str << tmp << _(" min ");

4530

4399

}

4531

4532

tmp_buff_str.precision(duration.num_fractional_digits());

4533

4534

double seconds= duration.fractional_seconds();

4535

4536

seconds/= pow(10.0,duration.num_fractional_digits());

4537

4538

seconds+= duration.seconds();

4539

tmp_buff_str << seconds << _(" sec");

4540

4541

buff.append(tmp_buff_str.str());

4542

}

4543

4544

static void end_timer(boost::posix_time::ptime start_time, string &buff)

4545

{

4546

boost::posix_time::ptime end_time= start_timer();

4547

boost::posix_time::time_period duration(start_time, end_time);

4548

4549

nice_time(duration.length(), buff);

4550

}

4551

4552

4553

static void drizzle_end_timer(boost::posix_time::ptime start_time, string &buff)

4554

{

4555

buff.append(" (");

4556

end_timer(start_time,buff);

4557

buff.append(")");

4400

if (part_second)

4401

tmp_buff_str.precision(2);

4402

else

4403

tmp_buff_str.precision(0);

4404

tmp_buff_str << sec << _(" sec");

4405

strcpy(buff, tmp_buff_str.str().c_str());

4406

}

4407

4408

4409

static void end_timer(uint32_t start_time,char *buff)

4410

{

4411

nice_time((double) (start_timer() - start_time) /

4412

CLOCKS_PER_SEC,buff,1);

4413

}

4414

4415

4416

static void drizzle_end_timer(uint32_t start_time,char *buff)

4417

{

4418

buff[0]=' ';

4419

buff[1]='(';

4420

end_timer(start_time,buff+2);

4421

strcpy(strchr(buff, '\0'),")");

4558

4422

}

4559

4423

4560

4424

static const char * construct_prompt()

4693

4557

add_int_to_prompt(t->tm_sec);

4694

4558

break;

4695

4559

case 'w':

4696

processed_prompt->append(get_day_name(t->tm_wday));

4560

processed_prompt->append(day_names[t->tm_wday]);

4697

4561

break;

4698

4562

case 'P':

4699

4563

processed_prompt->append(t->tm_hour < 12 ? "am" : "pm");

4702

4566

add_int_to_prompt(t->tm_mon+1);

4703

4567

break;

4704

4568

case 'O':

4705

processed_prompt->append(get_month_name(t->tm_mon));

4569

processed_prompt->append(month_names[t->tm_mon]);

4706

4570

break;

4707

4571

case '\'':

4708

4572

processed_prompt->append("'");

4779

4643

if there isn't anything found.

4780

4644

4781

4645

4782

static const char * strcont(const char *str, const char *set)

4646

static const char * strcont(register const char *str, register const char *set)

4783

4647

{

4784

const char * start = (const char *) set;

4648

4785

4649

4786

4650

while (*str)

4787

4651

{

Older »