#1137. Implemented.

v0.27.3
Robin Mills 10 years ago
parent cad39b5ee7
commit cc5f0f434e

@ -623,6 +623,11 @@ namespace Action {
<< std::right << std::hex << std::right << std::hex
<< md.tag(); << md.tag();
} }
if (Params::instance().printItems_ & Params::prSet) {
if (!first) std::cout << " ";
first = false;
std::cout << "set" ;
}
if (Params::instance().printItems_ & Params::prGroup) { if (Params::instance().printItems_ & Params::prGroup) {
if (!first) std::cout << " "; if (!first) std::cout << " ";
first = false; first = false;

@ -610,6 +610,7 @@ int Params::evalPrintFlags(const std::string& optarg)
case 'v': printItems_ |= prValue; break; case 'v': printItems_ |= prValue; break;
case 't': printItems_ |= prTrans; break; case 't': printItems_ |= prTrans; break;
case 'h': printItems_ |= prHex; break; case 'h': printItems_ |= prHex; break;
case 'V': printItems_ |= prSet|prValue;break;
default: default:
std::cerr << progname() << ": " << _("Unrecognized print item") << " `" std::cerr << progname() << ": " << _("Unrecognized print item") << " `"
<< optarg[i] << "'\n"; << optarg[i] << "'\n";
@ -1096,14 +1097,15 @@ namespace {
for ( ; filename != end; ++filename) { for ( ; filename != end; ++filename) {
try { try {
std::ifstream file(filename->c_str()); std::ifstream file(filename->c_str());
if (!file) { bool bStdin = filename->compare("-")== 0;
if (!file && !bStdin) {
std::cerr << *filename << ": " std::cerr << *filename << ": "
<< _("Failed to open command file for reading\n"); << _("Failed to open command file for reading\n");
return false; return false;
} }
int num = 0; int num = 0;
std::string line; std::string line;
while (std::getline(file, line)) { while (std::getline(bStdin? std::cin : file, line)) {
ModifyCmd modifyCmd; ModifyCmd modifyCmd;
if (parseLine(modifyCmd, line, ++num)) { if (parseLine(modifyCmd, line, ++num)) {
modifyCmds.push_back(modifyCmd); modifyCmds.push_back(modifyCmd);

@ -165,7 +165,8 @@ public:
prSize = 128, prSize = 128,
prValue = 256, prValue = 256,
prTrans = 512, prTrans = 512,
prHex = 1024 prHex = 1024,
prSet = 2048
}; };
//! Enumerates common targets, bitmap //! Enumerates common targets, bitmap

Loading…
Cancel
Save