Brought "addattr" command into shape, and got rid off a lot of
weird stuff - and libbe.so; it now uses the attribute functions as exported by libroot.so :) Improved handling of boolean values, improved error messages a lot. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10374 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
@@ -1,9 +1,6 @@
|
|||||||
SubDir OBOS_TOP src apps bin addattr ;
|
SubDir OBOS_TOP src apps bin addattr ;
|
||||||
|
|
||||||
BinCommand addattr :
|
BinCommand addattr :
|
||||||
addAttr.cpp
|
|
||||||
main.cpp
|
main.cpp
|
||||||
messages.cpp
|
addAttr.cpp
|
||||||
: be
|
;
|
||||||
;
|
|
||||||
|
|
||||||
|
|||||||
+120
-163
@@ -1,188 +1,145 @@
|
|||||||
// Author: Sebastian Nozzi
|
/*
|
||||||
// Created: 3 may 2002
|
* Copyright 2004, Axel Dörfler, [email protected].
|
||||||
|
* Copyright 2002, Sebastian Nozzi.
|
||||||
|
*
|
||||||
|
* Distributed under the terms of the MIT license.
|
||||||
|
*/
|
||||||
|
|
||||||
// Modifications:
|
|
||||||
// (please include author, date, and description)
|
|
||||||
|
|
||||||
// [email protected]: note the original one doesn't link to libbe
|
|
||||||
|
|
||||||
|
|
||||||
#include <TypeConstants.h>
|
|
||||||
#include <SupportDefs.h>
|
|
||||||
#include <Mime.h>
|
|
||||||
#include <Entry.h>
|
|
||||||
#include <Node.h>
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
#include "addAttr.h"
|
#include "addAttr.h"
|
||||||
#include "messages.h"
|
|
||||||
|
|
||||||
// Adds a certain attribute to many files, specified in an array
|
#include <TypeConstants.h>
|
||||||
// of strings
|
#include <Mime.h>
|
||||||
//
|
|
||||||
// On success it will return B_OK
|
|
||||||
// On failure it returns an error code (negative number)
|
|
||||||
status_t addAttrToFiles( type_code attrType,
|
|
||||||
const char *attrName,
|
|
||||||
const char *attrValue,
|
|
||||||
char **files,
|
|
||||||
unsigned fileCount ) {
|
|
||||||
|
|
||||||
status_t returnCode;
|
#include <fs_attr.h>
|
||||||
status_t result;
|
|
||||||
unsigned fileIdx;
|
|
||||||
|
|
||||||
returnCode = B_OK;
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
|
||||||
// Iterate through all the files and add the attribute
|
|
||||||
// to each of them
|
|
||||||
|
|
||||||
for( fileIdx = 0; fileIdx < fileCount; fileIdx++ ) {
|
template<class Type>
|
||||||
result = addAttr( attrType, attrName, attrValue, files[fileIdx] );
|
ssize_t
|
||||||
// Try to keep the first error code, if any
|
writeAttrValue(int fd, const char *name, type_code type, Type value)
|
||||||
if( returnCode == B_OK && result != B_OK )
|
{
|
||||||
returnCode = result;
|
ssize_t bytes = fs_write_attr(fd, name, type, 0, &value, sizeof(Type));
|
||||||
}
|
if (bytes < 0)
|
||||||
|
return errno;
|
||||||
|
|
||||||
return returnCode;
|
return bytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adds an attribute to a file for the given type, name and value
|
|
||||||
// Locks and unlocks the corresponding node to avoid data inconsistence
|
|
||||||
// Converts the value accordingly in case of numeric or boolean types
|
|
||||||
//
|
|
||||||
// On success it will return the amount of bytes writen
|
|
||||||
// On failure it returns an error code (negative number)
|
|
||||||
status_t addAttr( type_code attrType,
|
|
||||||
const char *attrName,
|
|
||||||
const char *attrValue,
|
|
||||||
const char *file ) {
|
|
||||||
|
|
||||||
status_t returnCode;
|
/** Writes an attribute to a node, taking the type into account and
|
||||||
|
* convertig the value accordingly
|
||||||
|
*
|
||||||
|
* On success it will return the amount of bytes writen
|
||||||
|
* On failure it returns an error code (negative number)
|
||||||
|
*/
|
||||||
|
|
||||||
BNode node;
|
static ssize_t
|
||||||
// Traverse links
|
writeAttr(int fd, type_code type, const char *name, const char *value)
|
||||||
BEntry entry(file, true);
|
{
|
||||||
|
uint64 uint64value = 0;
|
||||||
|
int64 int64value = 0;
|
||||||
|
double floatValue = 0.0;
|
||||||
|
|
||||||
node.SetTo(&entry);
|
// parse number input at once
|
||||||
// Release file descriptor
|
|
||||||
entry.Unset();
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
switch (type) {
|
||||||
printf("%lu | %s | %s | %s\n", attrType, attrName, attrValue, file );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
returnCode = node.InitCheck();
|
|
||||||
|
|
||||||
if( returnCode == B_OK ) {
|
|
||||||
|
|
||||||
returnCode = node.Lock(); // to avoid data inconsistency
|
|
||||||
|
|
||||||
if( returnCode == B_OK ) {
|
|
||||||
// Only add the attribute if not already there
|
|
||||||
if( hasAttribute( &node, attrName ) == false ) {
|
|
||||||
|
|
||||||
ssize_t bytesWrittenCode;
|
|
||||||
|
|
||||||
// Write the attribute now
|
|
||||||
bytesWrittenCode = writeAttr( &node, attrType, attrName, attrValue );
|
|
||||||
|
|
||||||
// If negative, then it's an error code
|
|
||||||
if( bytesWrittenCode < 0 ) {
|
|
||||||
problemsWithFileMsg( file );
|
|
||||||
returnCode = bytesWrittenCode;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
node.Sync();
|
|
||||||
node.Unlock();
|
|
||||||
} else { // Node could not be locked
|
|
||||||
problemsWithFileMsg( file );
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// File could not be initialized
|
|
||||||
// (maybe it doesn't exist)
|
|
||||||
problemsWithFileMsg( file );
|
|
||||||
}
|
|
||||||
|
|
||||||
return returnCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Writes an attribute to a node, taking the type into account and
|
|
||||||
// convertig the value accordingly
|
|
||||||
//
|
|
||||||
// On success it will return the amount of bytes writen
|
|
||||||
// On failure it returns an error code (negative number)
|
|
||||||
ssize_t writeAttr( BNode *node, type_code attrType,
|
|
||||||
const char *attrName, const char *attrValue ) {
|
|
||||||
|
|
||||||
int32 int32buffer = 0;
|
|
||||||
int64 int64buffer = 0;
|
|
||||||
int boolBuffer = 0;
|
|
||||||
float floatBuffer = 0.0;
|
|
||||||
double doubleBuffer = 0.0;
|
|
||||||
|
|
||||||
ssize_t bytesWrittenOrErrorCode;
|
|
||||||
|
|
||||||
switch( attrType ) {
|
|
||||||
case B_INT32_TYPE:
|
|
||||||
sscanf( attrValue, "%ld", &int32buffer );
|
|
||||||
bytesWrittenOrErrorCode =
|
|
||||||
node->WriteAttr( attrName, attrType, 0, &int32buffer, sizeof(int32) );
|
|
||||||
break;
|
|
||||||
case B_INT64_TYPE:
|
|
||||||
sscanf( attrValue, "%lld", &int64buffer );
|
|
||||||
bytesWrittenOrErrorCode =
|
|
||||||
node->WriteAttr( attrName, attrType, 0, &int64buffer, sizeof(int64) );
|
|
||||||
break;
|
|
||||||
case B_FLOAT_TYPE:
|
|
||||||
sscanf( attrValue, "%f", &floatBuffer );
|
|
||||||
bytesWrittenOrErrorCode =
|
|
||||||
node->WriteAttr( attrName, attrType, 0, &floatBuffer, sizeof(float) );
|
|
||||||
break;
|
|
||||||
case B_DOUBLE_TYPE:
|
|
||||||
sscanf( attrValue, "%lf", &doubleBuffer );
|
|
||||||
bytesWrittenOrErrorCode =
|
|
||||||
node->WriteAttr( attrName, attrType, 0, &doubleBuffer, sizeof(double) );
|
|
||||||
break;
|
|
||||||
case B_BOOL_TYPE:
|
case B_BOOL_TYPE:
|
||||||
// NOTE: the conversion from "int" to "signed char" might seem strange
|
case B_INT8_TYPE:
|
||||||
// but this is the only way I could think to replicate Be's addattr behaviour
|
case B_INT16_TYPE:
|
||||||
sscanf( attrValue, "%d", &boolBuffer );
|
case B_INT32_TYPE:
|
||||||
boolBuffer = (signed char) boolBuffer;
|
case B_INT64_TYPE:
|
||||||
bytesWrittenOrErrorCode =
|
int64value = strtoll(value, NULL, 0);
|
||||||
node->WriteAttr( attrName, attrType, 0, &boolBuffer, sizeof(signed char) );
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case B_UINT8_TYPE:
|
||||||
|
case B_UINT16_TYPE:
|
||||||
|
case B_UINT32_TYPE:
|
||||||
|
case B_UINT64_TYPE:
|
||||||
|
uint64value = strtoull(value, NULL, 0);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case B_FLOAT_TYPE:
|
||||||
|
case B_DOUBLE_TYPE:
|
||||||
|
floatValue = strtod(value, NULL);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (type) {
|
||||||
|
case B_INT8_TYPE:
|
||||||
|
return writeAttrValue<int8>(fd, name, type, (int8)int64value);
|
||||||
|
case B_INT16_TYPE:
|
||||||
|
return writeAttrValue<int16>(fd, name, type, (int16)int64value);
|
||||||
|
case B_INT32_TYPE:
|
||||||
|
return writeAttrValue<int32>(fd, name, type, (int32)int64value);
|
||||||
|
case B_INT64_TYPE:
|
||||||
|
return writeAttrValue<int64>(fd, name, type, int64value);
|
||||||
|
|
||||||
|
case B_UINT8_TYPE:
|
||||||
|
return writeAttrValue<uint8>(fd, name, type, (uint8)uint64value);
|
||||||
|
case B_UINT16_TYPE:
|
||||||
|
return writeAttrValue<uint16>(fd, name, type, (uint16)uint64value);
|
||||||
|
case B_UINT32_TYPE:
|
||||||
|
return writeAttrValue<uint32>(fd, name, type, (uint32)uint64value);
|
||||||
|
case B_UINT64_TYPE:
|
||||||
|
return writeAttrValue<uint64>(fd, name, type, uint64value);
|
||||||
|
|
||||||
|
case B_FLOAT_TYPE:
|
||||||
|
return writeAttrValue<float>(fd, name, type, (float)floatValue);
|
||||||
|
case B_DOUBLE_TYPE:
|
||||||
|
return writeAttrValue<double>(fd, name, type, (double)floatValue);
|
||||||
|
|
||||||
|
case B_BOOL_TYPE:
|
||||||
|
{
|
||||||
|
uint8 boolValue = 0;
|
||||||
|
|
||||||
|
if (!strcasecmp(value, "true") || !strcasecmp(value, "t")
|
||||||
|
|| !strcasecmp(value, "on") || !strcasecmp(value, "enabled")
|
||||||
|
|| (isdigit(value[0]) && int64value == 1))
|
||||||
|
boolValue = 1;
|
||||||
|
else if (!strcasecmp(value, "false") || !strcasecmp(value, "f")
|
||||||
|
|| !strcasecmp(value, "off") || !strcasecmp(value, "disabled")
|
||||||
|
|| (isdigit(value[0]) && int64value == 0))
|
||||||
|
boolValue = 0;
|
||||||
|
else
|
||||||
|
return B_BAD_VALUE;
|
||||||
|
|
||||||
|
return writeAttrValue<uint8>(fd, name, B_BOOL_TYPE, boolValue);
|
||||||
|
}
|
||||||
|
|
||||||
case B_STRING_TYPE:
|
case B_STRING_TYPE:
|
||||||
case B_MIME_STRING_TYPE:
|
case B_MIME_STRING_TYPE:
|
||||||
default:
|
default:
|
||||||
// For string, mime-strings and any other type we just write the value
|
// For string, mime-strings and any other type we just write the value
|
||||||
// NOTE that the trailing NULL -IS- added
|
// NOTE that the trailing NULL -IS- added
|
||||||
bytesWrittenOrErrorCode =
|
ssize_t bytes = fs_write_attr(fd, name, type, 0, value, strlen(value) + 1);
|
||||||
node->WriteAttr( attrName, attrType, 0, attrValue, strlen(attrValue)+1 );
|
if (bytes < 0)
|
||||||
break;
|
return errno;
|
||||||
};
|
return bytes;
|
||||||
|
|
||||||
return bytesWrittenOrErrorCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Checks wether a node has an attribute under the given name or not
|
|
||||||
//
|
|
||||||
// The user is responsible for locking and unlocking the node, and
|
|
||||||
// for assuring that we are retrieving all attributes from the beginning
|
|
||||||
// by calling RewindAttrs() on the node, if necesary
|
|
||||||
bool hasAttribute( BNode *node, const char *attrName ) {
|
|
||||||
|
|
||||||
char retrievedName[B_ATTR_NAME_LENGTH];
|
|
||||||
bool found;
|
|
||||||
|
|
||||||
found = false;
|
|
||||||
|
|
||||||
while( (!found) && (node->GetNextAttrName( retrievedName )==B_OK) ) {
|
|
||||||
if( strcmp( retrievedName, attrName ) == 0 )
|
|
||||||
found = true;
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return found;
|
|
||||||
|
|
||||||
|
/** Adds an attribute to a file for the given type, name and value
|
||||||
|
* Converts the value accordingly in case of numeric or boolean types
|
||||||
|
*
|
||||||
|
* On success, it returns B_OK, or else an appropriate error code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
status_t
|
||||||
|
addAttr(const char *file, type_code type, const char *name, const char *value)
|
||||||
|
{
|
||||||
|
int fd = open(file, O_WRONLY);
|
||||||
|
if (fd < 0)
|
||||||
|
return errno;
|
||||||
|
|
||||||
|
fs_remove_attr(fd, name);
|
||||||
|
ssize_t bytes = writeAttr(fd, type, name, value);
|
||||||
|
|
||||||
|
return bytes >= 0 ? B_OK : bytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,30 +1,16 @@
|
|||||||
// Author: Sebastian Nozzi
|
/*
|
||||||
// Created: 3 may 2002
|
* Copyright 2004, Axel Dörfler, [email protected].
|
||||||
|
* Copyright 2002, Sebastian Nozzi.
|
||||||
// Modifications:
|
*
|
||||||
// (please include author, date, and description)
|
* Distributed under the terms of the MIT license.
|
||||||
|
*/
|
||||||
// [email protected]: note the original one doesn't link to libbe
|
|
||||||
|
|
||||||
#ifndef _ADD_ATTR_H
|
#ifndef _ADD_ATTR_H
|
||||||
#define _ADD_ATTR_H
|
#define _ADD_ATTR_H
|
||||||
|
|
||||||
#include <StorageDefs.h>
|
|
||||||
|
|
||||||
status_t addAttrToFiles( type_code attrType,
|
#include <SupportDefs.h>
|
||||||
const char *attrName,
|
|
||||||
const char *attrValue,
|
|
||||||
char **files,
|
|
||||||
unsigned fileCount );
|
|
||||||
|
|
||||||
status_t addAttr( type_code attrType,
|
|
||||||
const char *attrName,
|
|
||||||
const char *attrValue,
|
|
||||||
const char *file );
|
|
||||||
|
|
||||||
bool hasAttribute( BNode *node, const char *attrName );
|
|
||||||
ssize_t writeAttr( BNode *node, type_code attrType,
|
|
||||||
const char *attrName, const char *attrValue );
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
status_t addAttr(const char *file, type_code attrType, const char *attrName, const char *attrValue);
|
||||||
|
|
||||||
|
#endif /* _ADD_ATTR_H */
|
||||||
|
|||||||
+134
-104
@@ -1,9 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2004, Axel Dörfler, [email protected].
|
||||||
|
* Copyright 2002, Sebastian Nozzi.
|
||||||
|
*
|
||||||
|
* Distributed under the terms of the MIT license.
|
||||||
|
*/
|
||||||
|
|
||||||
// Author: Sebastian Nozzi
|
|
||||||
// Created: 1st may 2002
|
|
||||||
|
|
||||||
// Modifications:
|
|
||||||
// (please include author, date, and description)
|
|
||||||
|
|
||||||
#include <Mime.h>
|
#include <Mime.h>
|
||||||
#include <SupportDefs.h>
|
#include <SupportDefs.h>
|
||||||
@@ -15,122 +16,151 @@
|
|||||||
#include "addAttr.h"
|
#include "addAttr.h"
|
||||||
#include "messages.h"
|
#include "messages.h"
|
||||||
|
|
||||||
status_t typeForString( const char *attrSting, type_code *result );
|
|
||||||
|
|
||||||
int main( int argc, char*argv[] )
|
// supported types (if you add any, make sure that writeAttr() handles them properly)
|
||||||
|
|
||||||
|
const struct {
|
||||||
|
type_code type;
|
||||||
|
const char *name;
|
||||||
|
} kSupportedTypes[] = {
|
||||||
|
{B_STRING_TYPE, "string"},
|
||||||
|
{B_MIME_STRING_TYPE, "mime"},
|
||||||
|
|
||||||
|
{B_INT32_TYPE, "int32"},
|
||||||
|
{B_INT32_TYPE, "int"},
|
||||||
|
{B_UINT32_TYPE, "uint32"},
|
||||||
|
{B_UINT32_TYPE, "uint"},
|
||||||
|
|
||||||
|
{B_INT64_TYPE, "int64"},
|
||||||
|
{B_INT64_TYPE, "llong"},
|
||||||
|
{B_UINT64_TYPE, "uint64"},
|
||||||
|
{B_UINT64_TYPE, "ullong"},
|
||||||
|
|
||||||
|
{B_FLOAT_TYPE, "float"},
|
||||||
|
{B_DOUBLE_TYPE, "double"},
|
||||||
|
|
||||||
|
{B_BOOL_TYPE, "bool"},
|
||||||
|
};
|
||||||
|
const uint32 kNumSupportedTypes = sizeof(kSupportedTypes) / sizeof(kSupportedTypes[0]);
|
||||||
|
|
||||||
|
char *gProgramName;
|
||||||
|
|
||||||
|
|
||||||
|
/** For the given string that the user specifies as attribute type
|
||||||
|
* in the command line, this function tries to figure out the
|
||||||
|
* corresponding Be API value.
|
||||||
|
*
|
||||||
|
* On success, "result" will contain that value
|
||||||
|
* On failure, B_BAD_VALUE is returned and "result" is not modified
|
||||||
|
*/
|
||||||
|
|
||||||
|
static status_t
|
||||||
|
typeForString(const char *string, type_code *_result)
|
||||||
{
|
{
|
||||||
int returnCode;
|
for (uint32 i = 0; i < kNumSupportedTypes; i++) {
|
||||||
|
if (!strcmp(string, kSupportedTypes[i].name)) {
|
||||||
|
*_result = kSupportedTypes[i].type;
|
||||||
|
return B_OK;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
completeToolName = argv[0];
|
// type didn't show up - in this case, we parse the string
|
||||||
returnCode = 0;
|
// as number and use it directly as type code
|
||||||
|
|
||||||
if( argc > 1 ) {
|
if (sscanf(string, "%lu", _result) == 1)
|
||||||
type_code attrType;
|
return B_OK;
|
||||||
unsigned minArguments;
|
|
||||||
bool usingDefaultAttr;
|
|
||||||
bool validAttrType;
|
|
||||||
|
|
||||||
usingDefaultAttr = true;
|
return B_BAD_VALUE;
|
||||||
validAttrType = true;
|
}
|
||||||
minArguments = 3;
|
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
usage(void)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "usage: %s [-t type] attr value file1 [file2...]\n", gProgramName);
|
||||||
|
fprintf(stderr, "\tType is one of:\n");
|
||||||
|
fprintf(stderr, "\t\tstring, mime, int, llong, float, double, bool,\n");
|
||||||
|
fprintf(stderr, "\t\tor a numeric value (ie. 0x1234, 42, ...)\n");
|
||||||
|
fprintf(stderr, "\tThe default is `string\'\n");
|
||||||
|
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
invalidAttrType(const char *attrTypeName)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "%s: attribute type \"%s\" is not valid\n", gProgramName, attrTypeName);
|
||||||
|
fprintf(stderr, "\tTry one of: string, mime, int, llong, float, double,\n");
|
||||||
|
fprintf(stderr, "\t\tbool, or a numeric value (ie. 0x1234, 42, ...)\n");
|
||||||
|
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
invalidBoolValue(const char *value)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "%s: attribute value \"%s\" is not valid\n", gProgramName, value);
|
||||||
|
fprintf(stderr, "\tBool accepts: 0, f, false, disabled, off,\n");
|
||||||
|
fprintf(stderr, "\t\t1, t, true, enabled, on\n");
|
||||||
|
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int
|
||||||
|
main(int argc, char *argv[])
|
||||||
|
{
|
||||||
|
gProgramName = strrchr(argv[0], '/');
|
||||||
|
if (gProgramName == NULL)
|
||||||
|
gProgramName = argv[0];
|
||||||
|
else
|
||||||
|
gProgramName++;
|
||||||
|
|
||||||
|
if (argc < 3 || !strcmp(argv[1], "--help") || !strcmp(argv[1], "-h"))
|
||||||
|
usage();
|
||||||
|
|
||||||
|
type_code attrType = B_STRING_TYPE;
|
||||||
|
|
||||||
|
int32 i = 2;
|
||||||
|
|
||||||
|
if (!strcmp(argv[1], "-t")) {
|
||||||
// Get the attribute type
|
// Get the attribute type
|
||||||
if( strcmp( argv[1], "-t" ) == 0 ) {
|
if (typeForString(argv[2], &attrType) != B_OK)
|
||||||
if( argc == 2 ) {
|
invalidAttrType(argv[2]);
|
||||||
invalidAttrMsg( "(null)" );
|
|
||||||
validAttrType = false;
|
|
||||||
returnCode = 1;
|
|
||||||
} else if( typeForString( argv[2], &attrType ) == B_BAD_VALUE ) {
|
|
||||||
invalidAttrMsg( argv[2] );
|
|
||||||
validAttrType = false;
|
|
||||||
returnCode = 1;
|
|
||||||
} else {
|
|
||||||
usingDefaultAttr = false;
|
|
||||||
minArguments = 5;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// The user didn't specify a type
|
|
||||||
// The default is 'string'
|
|
||||||
attrType = B_STRING_TYPE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if( validAttrType ) {
|
i++;
|
||||||
if( (unsigned)argc > minArguments ) {
|
|
||||||
char **files;
|
|
||||||
char *attrName;
|
|
||||||
char *attrValue;
|
|
||||||
|
|
||||||
// The location of the rest of the argument
|
|
||||||
// varies depending on wether there was a
|
|
||||||
// "-t" switch or not
|
|
||||||
if( usingDefaultAttr ) {
|
|
||||||
attrName = argv[1];
|
|
||||||
attrValue = argv[2];
|
|
||||||
files = &(argv[3]);
|
|
||||||
} else {
|
|
||||||
attrName = argv[3];
|
|
||||||
attrValue = argv[4];
|
|
||||||
files = &(argv[5]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Now that we gathered all the information proceed
|
|
||||||
// to add the attribute to the file(s)
|
|
||||||
addAttrToFiles( attrType, attrName, attrValue,
|
|
||||||
files, argc-minArguments );
|
|
||||||
|
|
||||||
} else { // some arguments are missing
|
|
||||||
usageMsg();
|
|
||||||
returnCode = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else { // called with no arguments
|
|
||||||
usageMsg();
|
|
||||||
returnCode = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return returnCode;
|
const char *attrName = argv[i++];
|
||||||
}
|
const char *attrValue = argv[i++];
|
||||||
|
|
||||||
// For the given string that the user specifies as attribute type
|
// no files specified
|
||||||
// in the command line, this function tries to figure out the
|
if (argv[i] == NULL)
|
||||||
// corresponding Be API value
|
usage();
|
||||||
//
|
|
||||||
// On success, "result" will contain that value
|
|
||||||
// On failure, B_BAD_VALUE is returned and "result" is not modified
|
|
||||||
status_t typeForString( const char *attrString, type_code *result )
|
|
||||||
{
|
|
||||||
status_t returnCode;
|
|
||||||
|
|
||||||
returnCode = B_OK;
|
// Now that we gathered all the information proceed
|
||||||
|
// to add the attribute to the file(s)
|
||||||
|
|
||||||
if( strcmp( attrString, "string" ) == 0 ){
|
int result = 0;
|
||||||
*result = B_STRING_TYPE;
|
|
||||||
} else if( strcmp( attrString, "mime" ) == 0 ){
|
|
||||||
*result = B_MIME_STRING_TYPE;
|
|
||||||
} else if( strcmp( attrString, "int" ) == 0 ) {
|
|
||||||
*result = B_INT32_TYPE;
|
|
||||||
} else if( strcmp( attrString, "llong" ) == 0 ) {
|
|
||||||
*result = B_INT64_TYPE;
|
|
||||||
} else if( strcmp( attrString, "float" ) == 0 ) {
|
|
||||||
*result = B_FLOAT_TYPE;
|
|
||||||
} else if( strcmp( attrString, "double" ) == 0 ) {
|
|
||||||
*result = B_DOUBLE_TYPE;
|
|
||||||
} else if( strcmp( attrString, "bool" ) == 0 ) {
|
|
||||||
*result = B_BOOL_TYPE;
|
|
||||||
} else {
|
|
||||||
int convertedFields;
|
|
||||||
type_code tempCode;
|
|
||||||
|
|
||||||
convertedFields = sscanf( attrString, "%lu", &tempCode );
|
for (; i < argc; i++) {
|
||||||
|
status_t status = addAttr(argv[i], attrType, attrName, attrValue);
|
||||||
|
|
||||||
if( convertedFields > 0 ) {
|
// special case for bool types
|
||||||
*result = tempCode;
|
if (status == B_BAD_VALUE && attrType == B_BOOL_TYPE)
|
||||||
} else {
|
invalidBoolValue(attrValue);
|
||||||
returnCode = B_BAD_VALUE;
|
|
||||||
|
if (status != B_OK) {
|
||||||
|
fprintf(stderr, "%s: can\'t add attribute to file %s: %s\n",
|
||||||
|
gProgramName, argv[i], strerror(status));
|
||||||
|
|
||||||
|
// proceed files, but return an error at the end
|
||||||
|
result = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return returnCode;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
// Author: Sebastian Nozzi
|
|
||||||
// Created: 3 may 2002
|
|
||||||
|
|
||||||
// Modifications:
|
|
||||||
// (please include author, date, and description)
|
|
||||||
|
|
||||||
// [email protected]: note the original one doesn't link to libbe
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
// Keeps the complete name of this binary at run-time
|
|
||||||
// To be set at the beginning of the programm
|
|
||||||
char *completeToolName;
|
|
||||||
|
|
||||||
// Predefined command line messages for the user
|
|
||||||
|
|
||||||
void usageMsg() {
|
|
||||||
fprintf( stderr, "usage: %s [-t type] attr value file1 [file2...]\n", completeToolName);
|
|
||||||
fprintf( stderr, "\tType is one of:\n");
|
|
||||||
fprintf( stderr, "\t\tstring, mime, int, llong, float, double, bool,\n");
|
|
||||||
fprintf( stderr, "\t\tor a numeric value\n");
|
|
||||||
fprintf( stderr, "\tThe default is `string\'\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
void invalidAttrMsg( const char *attrTypeName ) {
|
|
||||||
fprintf( stderr, "%s: attribute type %s is not valid\n",completeToolName, attrTypeName);
|
|
||||||
fprintf( stderr, "\tTry one of: string, mime, int, llong, float, double,\n");
|
|
||||||
fprintf( stderr, "\t\tbool, or a <number>\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
void problemsWithFileMsg( const char *file )
|
|
||||||
{
|
|
||||||
fprintf( stderr, "%s: can\'t open file %s to add attribute\n", completeToolName, file );
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
// Author: Sebastian Nozzi
|
|
||||||
// Created: 3 may 2002
|
|
||||||
|
|
||||||
// Modifications:
|
|
||||||
// (please include author, date, and description)
|
|
||||||
|
|
||||||
// [email protected]: note the original one doesn't link to libbe
|
|
||||||
|
|
||||||
#ifndef _ADDATTR_MSG_H
|
|
||||||
#define _ADDATTR_MSG_H
|
|
||||||
|
|
||||||
extern char *completeToolName;
|
|
||||||
|
|
||||||
void usageMsg();
|
|
||||||
void invalidAttrMsg( const char *attrTypeName );
|
|
||||||
void problemsWithFileMsg( const char *file );
|
|
||||||
|
|
||||||
#endif
|
|
||||||
Reference in New Issue
Block a user