sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

Updated definition of fstring.

Browse Source 
print_asc(): Don't try to print a trailing NULL character
print_key(), print_rec(): Display key in ASCII
(This used to be commit 303b3a3595)
This commit is contained in:
Tim Potter 2001-12-03 00:23:14 +00:00
parent 61f68bde82
commit 3171064521
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source3/tdb/tdbtool.c
View File

@ -37,7 +37,7 @@
/* a tdb tool for manipulating a tdb database */ /* a tdb tool for manipulating a tdb database */
#define FSTRING_LEN 128 #define FSTRING_LEN 256
typedef char fstring[FSTRING_LEN]; typedef char fstring[FSTRING_LEN];
typedef struct connections_key { typedef struct connections_key {
@ -65,6 +65,13 @@ static int print_rec(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
static void print_asc(unsigned char *buf,int len) static void print_asc(unsigned char *buf,int len)
{ {
int i; int i;
/* We're probably printing ASCII strings so don't try to display
the trailing NULL character. */
if (buf[len - 1] == 0)
len--;
for (i=0;i<len;i++) for (i=0;i<len;i++)
printf("%c",isprint(buf[i])?buf[i]:'.'); printf("%c",isprint(buf[i])?buf[i]:'.');
} }
@ -299,7 +306,7 @@ static int print_rec(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
return 0; return 0;
#else #else
printf("\nkey %d bytes\n", key.dsize); printf("\nkey %d bytes\n", key.dsize);
print_data(key.dptr, key.dsize); print_asc(key.dptr, key.dsize);
printf("data %d bytes\n", dbuf.dsize); printf("data %d bytes\n", dbuf.dsize);
print_data(dbuf.dptr, dbuf.dsize); print_data(dbuf.dptr, dbuf.dsize);
return 0; return 0;
@ -308,8 +315,8 @@ static int print_rec(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
static int print_key(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state) static int print_key(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
{ {
printf("\nkey %d bytes\n", key.dsize); print_asc(key.dptr, key.dsize);
print_data(key.dptr, key.dsize); printf("\n");
return 0; return 0;
} }