diff --git a/.cproject b/.cproject
index 2896b4e..934eee6 100644
--- a/.cproject
+++ b/.cproject
@@ -55,53 +55,8 @@
-
- make
- libACTK1_0.so
- true
- true
- true
-
-
- make
-
- clean
- true
- true
- true
-
-
- make
- tests
- true
- true
- true
-
-
- make
- dirs
- true
- true
- true
-
-
- make
- dclean
- true
- true
- true
-
-
- make
-
- all
- false
- true
- true
-
make
-
clean
true
true
@@ -109,7 +64,6 @@
make
-
all
true
true
@@ -117,14 +71,68 @@
make
+
tests
true
true
true
+
+ make
+
+ libACTK1_0.so
+ true
+ true
+ true
+
+
+ make
+ clean
+ true
+ true
+ true
+
+
+ make
+
+ tests
+ true
+ true
+ true
+
+
+ make
+
+ dirs
+ true
+ true
+ true
+
+
+ make
+
+ dclean
+ true
+ true
+ true
+
+
+ make
+ all
+ false
+ true
+ true
+
+
+ make
+
+ xsd2xml
+ true
+ true
+ true
+
make
-
clean
true
true
@@ -132,6 +140,7 @@
make
+
dirs
true
true
@@ -139,6 +148,7 @@
make
+
ausreg_cd
true
true
@@ -146,6 +156,7 @@
make
+
apig-cli
true
true
@@ -153,36 +164,13 @@
make
-
build/commander.o
true
true
true
-
- make
- all
- true
- true
- true
-
-
- make
- tests
- true
- true
- true
-
-
- make
- clean
- true
- true
- true
-
make
-
cliever
true
true
@@ -190,6 +178,7 @@
make
+
clean
false
true
@@ -197,6 +186,7 @@
make
+
distclean
true
true
@@ -204,11 +194,36 @@
make
+
build/ausreg-md
true
true
true
+
+ make
+
+ all
+ true
+ true
+ true
+
+
+ make
+
+ tests
+ true
+ true
+ true
+
+
+ make
+
+ clean
+ true
+ true
+ true
+
diff --git a/ACTK1_0/Makefile b/ACTK1_0/Makefile
index 2f21454..5c2d769 100644
--- a/ACTK1_0/Makefile
+++ b/ACTK1_0/Makefile
@@ -69,7 +69,7 @@ test_execs = $(subst .o,,$(test_objs))
calc_deps = \
$(CC) -MT '$(build_obj_dir)/$(basename $(notdir $@)).o $@' -MF $@ -MM $(CPPFLAGS) $(INCLUDE_DIR) $<
-all: dirs $(objs) $(BUILD_LIB_DIR)/libACTK1_0.so
+all: dirs $(objs) $(BUILD_LIB_DIR)/libACTK1_0.so
%.d: %.c
$(calc_deps)
@@ -80,6 +80,7 @@ include $(foreach name,$(srcs_all),$(basename $(name)).d)
vpath %.cpp ./ \
./se\
./OTE \
+ ./xsd2xml \
./se/secDNS\
./xml\
./common\
@@ -149,6 +150,10 @@ dirs:
libACTK1_0.so:
$(BUILD_LIB_DIR)/libACTK1_0.so: $(objs)
$(CXX) $(LDFLAGS) $(PRODORDEV) -shared $(ARTKOBJS) -o $@
+
+xsd2xml:
+$(BUILD_OBJ_DIR)/xsd2xml: build/parser.o
+ $(CXX) build/parser.o -o build/xsd2xml -o $@
doc:
doxygen etc/Doxyfile
diff --git a/ACTK1_0/common/init.hpp b/ACTK1_0/common/init.hpp
index c3ccfe1..f16464b 100644
--- a/ACTK1_0/common/init.hpp
+++ b/ACTK1_0/common/init.hpp
@@ -7,6 +7,6 @@ char *userLogPath = "./logs/";
int tkDebugThreshold = 9999999999;
void init(const std::string &system_props_file);
-void scenario(int which,const std::string &system_props_file);
+void scenario(int which,const std::string &system_props_file);
#endif
diff --git a/APIG/client/commander.cpp b/APIG/client/commander.cpp
index a243a71..5059d50 100644
--- a/APIG/client/commander.cpp
+++ b/APIG/client/commander.cpp
@@ -47,6 +47,7 @@ void mdCommander::doHeader() {
}
int mdCommander::selectArg() {
+ bool didSelect = false;
char legend1[80]="Elements: ",selection[10];
int i, wrow=5;
@@ -57,10 +58,16 @@ int mdCommander::selectArg() {
mvprintw(wrow,2,(char *)legend1);
- say((char *)"Select arg string type");
+ while (!didSelect) {
+ say((char *)"Select element to edit");
prompt(true);
mvgetstr(row-1,2,selection);
thisArg = atoi(selection);
+ if (thisArg >= 1 and thisArg <= eppArgs[commandsNow[cmdNow]].n + 1)
+ didSelect = true;
+ else beep();
+ } -
+ thisArg--;
}
void mdCommander::getArgStringsByType() {
@@ -112,7 +119,7 @@ void mdCommander::driver() {
initscr();
cbreak();
getmaxyx(stdscr,row,col);
- if (row < 30 || col < 80) {
+ if (row < 30 || col < 80) { beep();
std::cerr << "Terminal too small for AC commander.";
}
greet();
@@ -125,7 +132,7 @@ void mdCommander::driver() {
while(next != '\012') {
next = mvgetch(row-1,2+i);
rawString[i++] = next;
- if (i > (sizeof(rawString) - 1)) {
+ if (i > (sizeof(rawString) - 1)) { beep();
say((char *)"Max length exceeded!");
continue;
}
@@ -215,7 +222,7 @@ void mdCommander::driver() {
sendCommand(cmdNow);
doHeader();
}
- else say((char *)"Invalid Command Index");
+ else {beep(); say((char *)"Invalid Command Index");}
break;
case 'X':
if (!targetCmd) {targetCmd = 0; x = true;}
@@ -224,7 +231,7 @@ void mdCommander::driver() {
flushCommand(targetCmd,x);
doHeader();
}
- else say((char *)"Invalid Command Index");
+ else {say((char *)"Invalid Command Index"); beeo*();}
break;
}
continue;
@@ -258,7 +265,7 @@ void mdCommander::driver() {
system(work);
shm.remove("ausreg-cd-global");
sprintf(work,"rm /tmp/ausreg-cd.lock");
- shm.remove("ausreg-cd-global");
+ system(work);
sprintf(work,"rm /tmp/ausreg-cd-ui.log");
system(work);
sprintf(work,"rm /tmp/ausreg-cd.log");
@@ -283,7 +290,7 @@ void mdCommander::greet() {
const char *title="AusReg Cliever Commander",
*warn="NB: this program is meant to be powerful and fast, not safe or user friendly",
*prompt="Enter ? or command",
- *advise="Please rm /tmp/ausreg-cd.lock-when done so others can use on this host";
+ *advise="When done: rm /tmp/ausreg-cd.lock to make this program available for others on this host";
sprintf(theBanner,banner,thisConfig->shellProcess,thisConfig->daemonProcess);
mvprintw(0,(col-strlen(banner))/2,"%s",theBanner);
@@ -490,7 +497,8 @@ const char *befehlJetzt = cmdNames[commandsNow[cmdNow]];
if (!run) {
if (!argsNow[cmdNow]) {
selectArg();
- say((char *)"Enter arg string(s), just enter to end");
+ sprintf(sp,"Enter strings for '%s', enter to end",eppArgs[commandsNow[cmdNow]].names[thisArg]);
+ say(sp);
getArgStringsByType();
} else {
nocbreak();