Changeset 132 for trunk/src/sh_calls.c
- Timestamp:
- Oct 23, 2007, 11:44:41 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/sh_calls.c
r22 r132 115 115 int error; 116 116 long int val_retry = -1; 117 char errbuf[SH_ERRBUF_SIZE]; 117 118 errno = 0; 118 119 … … 126 127 if (val_retry < 0) { 127 128 sh_error_handle ((-1), file, line, error, MSG_ERR_SIGACT, 128 sh_error_message(error ),129 sh_error_message(error, errbuf, sizeof(errbuf)), 129 130 (long) signum ); 130 131 } … … 161 162 long int val_retry = 0; 162 163 static struct sockaddr_in new_addr; 164 char errbuf[SH_ERRBUF_SIZE]; 163 165 164 166 SL_ENTER(_("retry_connect")); … … 189 191 */ 190 192 sh_error_handle ((-1), file, line, error, MSG_ERR_CONNECT, 191 sh_error_message(error ),193 sh_error_message(error, errbuf, sizeof(errbuf)), 192 194 (long) sockfd, 193 195 /*@-unrecog -type@*/ … … 212 214 int error; 213 215 long int val_retry = -1; 216 char errbuf[SH_ERRBUF_SIZE]; 217 214 218 ACCEPT_TYPE_ARG3 my_addrlen = (ACCEPT_TYPE_ARG3) *addrlen; 215 219 … … 225 229 if (val_retry < 0) { 226 230 sh_error_handle ((-1), file, line, error, MSG_ERR_ACCEPT, 227 sh_error_message(error ),231 sh_error_message(error, errbuf, sizeof(errbuf)), 228 232 (long) fd ); 229 233 } … … 237 241 int error; 238 242 long int val_retry = -1; 243 char errbuf[SH_ERRBUF_SIZE]; 239 244 240 245 SL_ENTER(_("retry_lstat")); … … 245 250 error = errno; 246 251 if (val_retry < 0) { 247 (void) sl_strlcpy(aud_err_message, sh_error_message(error ), 64);252 (void) sl_strlcpy(aud_err_message, sh_error_message(error, errbuf, sizeof(errbuf)), 64); 248 253 sh_error_handle ((-1), file, line, error, MSG_ERR_LSTAT, 249 sh_error_message(error ),254 sh_error_message(error, errbuf, sizeof(errbuf)), 250 255 file_name ); 251 256 } … … 259 264 int error; 260 265 long int val_retry = -1; 266 char errbuf[SH_ERRBUF_SIZE]; 261 267 262 268 SL_ENTER(_("retry_stat")); … … 267 273 error = errno; 268 274 if (val_retry < 0) { 269 (void) sl_strlcpy(aud_err_message, sh_error_message(error ), 64);275 (void) sl_strlcpy(aud_err_message, sh_error_message(error, errbuf, sizeof(errbuf)), 64); 270 276 sh_error_handle ((-1), file, line, error, MSG_ERR_STAT, 271 sh_error_message(error ),277 sh_error_message(error, errbuf, sizeof(errbuf)), 272 278 file_name ); 273 279 } … … 280 286 int error; 281 287 long int val_retry = -1; 288 char errbuf[SH_ERRBUF_SIZE]; 282 289 283 290 SL_ENTER(_("retry_fstat")); … … 289 296 if (val_retry < 0) { 290 297 sh_error_handle ((-1), file, line, error, MSG_ERR_FSTAT, 291 sh_error_message(error ),298 sh_error_message(error, errbuf, sizeof(errbuf)), 292 299 (long) filed ); 293 300 } … … 300 307 int error; 301 308 long int val_retry = -1; 309 char errbuf[SH_ERRBUF_SIZE]; 302 310 errno = 0; 303 311 … … 319 327 if (val_retry < 0) { 320 328 sh_error_handle ((-1), file, line, error, MSG_ERR_FCNTL, 321 sh_error_message(error ),329 sh_error_message(error, errbuf, sizeof(errbuf)), 322 330 (long) fd, (long) cmd, arg ); 323 331 } … … 389 397 int i; 390 398 int error; 399 char errbuf[SH_ERRBUF_SIZE]; 391 400 392 401 SL_ENTER(_("retry_aud_execve")); … … 401 410 error = errno; 402 411 if (i < 0) { 403 sh_error_handle ((-1), file, line, error, MSG_ERR_EXEC, sh_error_message(error), 412 sh_error_handle ((-1), file, line, error, MSG_ERR_EXEC, 413 sh_error_message(error, errbuf, sizeof(errbuf)), 404 414 dateiname, (long) a, (long) b ); 405 415 } … … 414 424 long int val_return; 415 425 int error; 426 char errbuf[SH_ERRBUF_SIZE]; 416 427 errno = 0; 417 428 … … 430 441 if (val_return < 0) { 431 442 sh_error_handle ((-1), file, line, error, MSG_ERR_UTIME, 432 sh_error_message(error ),443 sh_error_message(error, errbuf, sizeof(errbuf)), 433 444 path, 434 445 (unsigned long) buf->actime, … … 444 455 long int val_return; 445 456 int error; 457 char errbuf[SH_ERRBUF_SIZE]; 446 458 errno = 0; 447 459 … … 457 469 path); 458 470 if (val_return < 0) { 459 sh_error_handle ((-1), file, line, error, MSG_ERR_UNLINK, sh_error_message(error), 471 sh_error_handle ((-1), file, line, error, MSG_ERR_UNLINK, 472 sh_error_message(error, errbuf, sizeof(errbuf)), 460 473 path); 461 474 } … … 469 482 long int val_return; 470 483 int error; 484 char errbuf[SH_ERRBUF_SIZE]; 471 485 errno = 0; 472 486 … … 483 497 if (val_return < 0) { 484 498 sh_error_handle ((-1), file, line, error, MSG_ERR_DUP, 485 sh_error_message(error ),499 sh_error_message(error, errbuf, sizeof(errbuf)), 486 500 (long) fd, val_return); 487 501 } … … 495 509 long int val_return; 496 510 int error; 511 char errbuf[SH_ERRBUF_SIZE]; 497 512 errno = 0; 498 513 … … 508 523 if (val_return < 0) { 509 524 sh_error_handle ((-1), file, line, error, MSG_ERR_DUP, 510 sh_error_message(error ),525 sh_error_message(error, errbuf, sizeof(errbuf)), 511 526 (long) fd, val_return); 512 527 } … … 522 537 long int val_return; 523 538 int error = 0; 539 char errbuf[SH_ERRBUF_SIZE]; 524 540 errno = 0; 525 541 … … 535 551 path); 536 552 if (val_return < 0) { 537 sh_error_handle ((-1), file, line, error, MSG_ERR_CHDIR, sh_error_message(error), 553 sh_error_handle ((-1), file, line, error, MSG_ERR_CHDIR, 554 sh_error_message(error, errbuf, sizeof(errbuf)), 538 555 path); 539 556 } … … 549 566 long int val_return; 550 567 int error; 568 char errbuf[SH_ERRBUF_SIZE]; 551 569 552 570 SL_ENTER(_("aud_open")); … … 566 584 if (val_return < 0) 567 585 { 568 (void) sl_strlcpy(aud_err_message, sh_error_message(error ), 64);586 (void) sl_strlcpy(aud_err_message, sh_error_message(error, errbuf, sizeof(errbuf)), 64); 569 587 } 570 588 … … 576 594 if (val_return < 0) { 577 595 sh_error_handle ((-1), file, line, error, MSG_ERR_OPEN, 578 sh_error_message(error ),596 sh_error_message(error, errbuf, sizeof(errbuf)), 579 597 pathname, (long) flags, (long) mode, val_return); 580 598 } … … 588 606 long int val_return; 589 607 int error; 608 char errbuf[SH_ERRBUF_SIZE]; 590 609 591 610 SL_ENTER(_("aud_open")); … … 599 618 if (val_return < 0) 600 619 { 601 (void) sl_strlcpy(aud_err_message, sh_error_message(error ), 64);620 (void) sl_strlcpy(aud_err_message, sh_error_message(error, errbuf, sizeof(errbuf)), 64); 602 621 } 603 622 … … 609 628 if (val_return < 0) { 610 629 sh_error_handle ((-1), file, line, error, MSG_ERR_OPEN, 611 sh_error_message(error ),630 sh_error_message(error, errbuf, sizeof(errbuf)), 612 631 pathname, (long) flags, (long) mode, val_return); 613 632 } … … 620 639 int myerror; 621 640 long int val_return = kill (pid, sig); 641 char errbuf[SH_ERRBUF_SIZE]; 622 642 myerror = errno; 623 643 … … 629 649 if (val_return < 0) { 630 650 sh_error_handle ((-1), file, line, myerror, MSG_ERR_KILL, 631 sh_error_message(myerror ),651 sh_error_message(myerror, errbuf, sizeof(errbuf)), 632 652 (long) pid, (long) sig); 633 653 } … … 666 686 int error; 667 687 pid_t i = fork(); 688 char errbuf[SH_ERRBUF_SIZE]; 668 689 669 690 error = errno; … … 675 696 if (i == (pid_t) -1) { 676 697 sh_error_handle ((-1), file, line, error, MSG_ERR_FORK, 677 sh_error_message(error ),698 sh_error_message(error, errbuf, sizeof(errbuf)), 678 699 (long) i); 679 700 } … … 686 707 int error = 0; 687 708 int i = 0; 709 char errbuf[SH_ERRBUF_SIZE]; 688 710 689 711 SL_ENTER(_("aud_setuid")); … … 702 724 if (i < 0) { 703 725 sh_error_handle ((-1), file, line, error, MSG_ERR_SETUID, 704 sh_error_message(error ),726 sh_error_message(error, errbuf, sizeof(errbuf)), 705 727 (long) uid); 706 728 } … … 713 735 int error = 0; 714 736 int i = 0; 737 char errbuf[SH_ERRBUF_SIZE]; 715 738 716 739 SL_ENTER(_("aud_setgid")); … … 730 753 if (i < 0) { 731 754 sh_error_handle ((-1), file, line, error, MSG_ERR_SETGID, 732 sh_error_message(error ),755 sh_error_message(error, errbuf, sizeof(errbuf)), 733 756 (long) gid); 734 757 } … … 741 764 int error; 742 765 int i = pipe (modus); 766 char errbuf[SH_ERRBUF_SIZE]; 743 767 744 768 SL_ENTER(_("aud_pipe")); … … 761 785 else 762 786 sh_error_handle ((-1), file, line, error, MSG_ERR_PIPE, 763 sh_error_message(error ),787 sh_error_message(error, errbuf, sizeof(errbuf)), 764 788 (long) modus[0], (long) modus[1]); 765 789 }
Note:
See TracChangeset
for help on using the changeset viewer.