Changeset 356
- Timestamp:
- Sep 5, 2011, 9:31:27 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/docs/Changelog
r355 r356 1 1 2.8.6: 2 * List the policy under which a directory/file is checked 2 3 * Option to use a textfile with a list of files for update 3 4 * Fix --enable-db-reload option (reported by David L.) -
trunk/include/sh_hash.h
r305 r356 27 27 #include "sh_unix.h" 28 28 #include "sh_error.h" 29 30 /* convert to policy string 31 */ 32 const char * sh_hash_getpolicy(int class); 29 33 30 34 /* format a uint64 -
trunk/src/sh_cat.c
r294 r356 40 40 { MSG_FI_CSUM, SH_ERR_ALL, FIL, N_("msg=\"Checksum\" chk=\"%s\" path=\"%s\"")}, 41 41 { MSG_FI_DSUM, SH_ERR_INFO, FIL, N_("msg=\"d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld\"")}, 42 { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=\"Checking \" path=\"%s\"")},42 { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=\"Checking %16s\" path=\"%s\"")}, 43 43 #endif 44 44 … … 181 181 { MSG_FI_CSUM, SH_ERR_ALL, FIL, N_("msg=\"Checksum\" chk=\"%s\" path=\"%s\"")}, 182 182 { MSG_FI_DSUM, SH_ERR_INFO, FIL, N_("msg=\"d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld\"")}, 183 { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=\"Checking \" path=\"%s\"")},183 { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=\"Checking %16s\" path=\"%s\"")}, 184 184 #endif 185 185 … … 382 382 { MSG_FI_CSUM, SH_ERR_ALL, FIL, N_("msg=<Checksum>, chk=<%s>, path=<%s>")}, 383 383 { MSG_FI_DSUM, SH_ERR_INFO, FIL, N_("msg=<d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld>")}, 384 { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=<Checking >, path=<%s>")},384 { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=<Checking %16s>, path=<%s>")}, 385 385 #endif 386 386 … … 522 522 { MSG_FI_CSUM, SH_ERR_ALL, FIL, N_("msg=<Checksum>, chk=<%s>, path=<%s>")}, 523 523 { MSG_FI_DSUM, SH_ERR_INFO, FIL, N_("msg=<d: %3ld, -: %3ld, l: %3ld, |: %3ld, s: %3ld, c: %3ld, b: %3ld>")}, 524 { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=<Checking >, path=<%s>")},524 { MSG_FI_CHK, SH_ERR_INFO, FIL, N_("msg=<Checking %16s>, path=<%s>")}, 525 525 #endif 526 526 -
trunk/src/sh_files.c
r310 r356 351 351 if (flag_err_info == SL_TRUE) 352 352 { 353 char pstr[32]; 353 354 #if !defined(WITH_TPT) 354 355 tmp = sh_util_safe_name (ptr->name); 355 356 #endif 356 sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_FI_CHK, tmp); 357 sl_strlcpy(pstr, sh_hash_getpolicy(ptr->class), sizeof(pstr)); 358 sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_FI_CHK, pstr, tmp); 357 359 } 358 360 … … 1808 1810 if (flag_err_info == SL_TRUE) 1809 1811 { 1810 sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_FI_CHK, tmpname); 1812 char pstr[32]; 1813 1814 sl_strlcpy(pstr, sh_hash_getpolicy(iclass), sizeof(pstr)); 1815 sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_FI_CHK, pstr, tmpname); 1811 1816 } 1812 1817 -
trunk/src/sh_hash.c
r354 r356 307 307 }; 308 308 309 const char * sh_hash_getpolicy(int class) 310 { 311 if (class > 0 && class < SH_ERR_T_DIR) 312 return _(policy[class]); 313 return _("[indef]"); 314 } 309 315 310 316 /**********************************
Note:
See TracChangeset
for help on using the changeset viewer.