Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

now supports the --raw or -r option to stream the original raw attribute data

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10822 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2005-01-18 03:15:42 +00:00
parent e8edb8545b
commit d4578d0fe1
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/apps/bin/catattr.cpp
View File

@ -1,4 +1,5 @@
/* /*
* Copyright 2005, Stephan Aßmus, superstippi@yellowbites.com.
* Copyright 2004, Axel Dörfler, axeld@pinc-software.de. * Copyright 2004, Axel Dörfler, axeld@pinc-software.de.
* Copyright 2002, Sebastian Nozzi. * Copyright 2002, Sebastian Nozzi.
* *
@ -67,7 +68,7 @@ dumpRawData(const char *buffer, size_t size)
static status_t static status_t
catAttr(const char *attribute, const char *fileName) catAttr(const char *attribute, const char *fileName, bool keepRaw = false)
{ {
int fd = open(fileName, O_RDONLY); int fd = open(fileName, O_RDONLY);
if (fd < 0) if (fd < 0)
@ -79,7 +80,7 @@ catAttr(const char *attribute, const char *fileName)
// limit size of the attribute, only the first 64k will make it on screen // limit size of the attribute, only the first 64k will make it on screen
off_t size = info.size; off_t size = info.size;
if (size > 64 * 1024) if (!keepRaw && size > 64 * 1024)
size = 64 * 1024; size = 64 * 1024;
char buffer[size]; char buffer[size];
@ -92,6 +93,15 @@ catAttr(const char *attribute, const char *fileName)
return B_ERROR; return B_ERROR;
} }
if (keepRaw) {
// TODO: well, this looks a bit slow, and does it even work for
// real binary data?!? -> please check
for (int32 i = 0; i < info.size; i++) {
putchar(buffer[i]);
}
return B_OK;
}
switch (info.type) { switch (info.type) {
case B_INT8_TYPE: case B_INT8_TYPE:
printf("%s : int8 : %d\n", fileName, *((int8 *)buffer)); printf("%s : int8 : %d\n", fileName, *((int8 *)buffer));
@ -152,19 +162,27 @@ main(int argc, char *argv[])
program++; program++;
if (argc > 2) { if (argc > 2) {
const char *attr = argv[1]; int32 attrNameIndex = 1;
bool keepRaw = false;
// see if user wants to get to the raw data of the attribute
if (strcmp(argv[attrNameIndex], "--raw") == 0 ||
strcmp(argv[attrNameIndex], "-r") == 0) {
attrNameIndex++;
keepRaw = true;
}
// Cat the attribute for every file given // Cat the attribute for every file given
for (int32 i = 2; i < argc; i++) { for (int32 i = attrNameIndex + 1; i < argc; i++) {
status_t status = catAttr(attr, argv[i]); status_t status = catAttr(argv[attrNameIndex], argv[i], keepRaw);
if (status != B_OK) { if (status != B_OK) {
fprintf(stderr, "%s: file \"%s\", attribute \"%s\": %s\n", fprintf(stderr, "%s: file \"%s\", attribute \"%s\": %s\n",
program, argv[i], attr, strerror(status)); program, argv[i], argv[attrNameIndex], strerror(status));
} }
} }
} else { } else {
// Issue usage message // Issue usage message
fprintf(stderr, "usage: %s attr_name file1 [file2...]\n", program); fprintf(stderr, "usage: %s [--raw|-r] attr_name file1 [file2...]\n", program);
// Be's original version -only- returned 1 if the // Be's original version -only- returned 1 if the
// amount of parameters was wrong, not if the file // amount of parameters was wrong, not if the file
// or attribute couldn't be found (!) // or attribute couldn't be found (!)