i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed error reporting in --raw mode

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10854 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2005-01-18 22:37:07 +00:00
parent fe93751f01
commit c49a6908b6
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/bin/catattr.cpp
+12 -5
View File
@@ -81,8 +81,10 @@ catAttr(const char *attribute, const char *fileName, bool keepRaw = false)
// 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 (size > 64 * 1024)
size = 64 * 1024; // size = 64 * 1024;
if (size > 64)
size = 64;
char* buffer = new char[size]; char* buffer = new char[size];
ssize_t bytesRead = fs_read_attr(fd, attribute, info.type, 0, buffer, size); ssize_t bytesRead = fs_read_attr(fd, attribute, info.type, 0, buffer, size);
@@ -105,9 +107,11 @@ catAttr(const char *attribute, const char *fileName, bool keepRaw = false)
written = write(STDOUT_FILENO, buffer, bytesRead); written = write(STDOUT_FILENO, buffer, bytesRead);
// check for write error // check for write error
if (written < bytesRead) { if (written < bytesRead) {
fprintf(stderr, "Could only write %ld bytes to stream!\n", written); if (written >= 0) {
if (written > 0) fprintf(stderr, "Could only write %ld bytes to stream!\n", written);
written = B_ERROR; written = B_ERROR;
} else
fprintf(stderr, "Failed to write to stream: %s\n", strerror(written));
break; break;
} }
// read next chunk of data at pos // read next chunk of data at pos
@@ -115,7 +119,10 @@ catAttr(const char *attribute, const char *fileName, bool keepRaw = false)
bytesRead = fs_read_attr(fd, attribute, info.type, pos, buffer, size); bytesRead = fs_read_attr(fd, attribute, info.type, pos, buffer, size);
// check for read error // check for read error
if (bytesRead < size && pos + bytesRead < info.size) { if (bytesRead < size && pos + bytesRead < info.size) {
fprintf(stderr, "Could only read %ld bytes from attribute!\n", bytesRead); if (bytesRead >= 0)
fprintf(stderr, "Could only read %ld bytes from attribute!\n", bytesRead);
else
fprintf(stderr, "Failed to read from attribute: %s\n", strerror(bytesRead));
written = B_ERROR; written = B_ERROR;
break; break;
} }