Skip to content

Commit e2d0d65

Browse files
grandixximograndixximo
authored
Merge pull request #4697 from grandixximo/rtapi-msg-newline
rtapi: end every message that lacks the newline
2 parents 16489af + de21b0b commit e2d0d65

21 files changed

Lines changed: 214 additions & 78 deletions

‎src/emc/motion/command.c‎

Lines changed: 25 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -664,8 +664,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
664664
Called by task using [KINS]JOINTS= which is typically
665665
the same value as the motmod num_joints= parameter
666666
*/
667-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_NUM_JOINTS");
668-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", emcmotCommand->joint);
667+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_NUM_JOINTS %d", emcmotCommand->joint);
669668
if (( emcmotCommand->joint <= 0 ) ||
670669
( emcmotCommand->joint > EMCMOT_MAX_JOINTS )) {
671670
break;
@@ -679,9 +678,8 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
679678
the number of spindles configured for the motion module
680679
(motion_num_spindles)
681680
*/
682-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_NUM_SPINDLES");
681+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_NUM_SPINDLES %d", emcmotCommand->spindle);
683682
emcmot_config_change();
684-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", emcmotCommand->spindle);
685683
if ( emcmotCommand->spindle > motion_num_spindles
686684
|| emcmotCommand->spindle <= 0
687685
|| emcmotCommand->spindle > EMCMOT_MAX_SPINDLES
@@ -706,8 +704,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
706704
break;
707705

708706
case EMCMOT_SET_JOINT_HOMING_PARAMS:
709-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_HOMING_PARAMS");
710-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
707+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_HOMING_PARAMS %d", joint_num);
711708
emcmot_config_change();
712709
if (joint == 0) {
713710
break;
@@ -727,8 +724,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
727724
break;
728725

729726
case EMCMOT_UPDATE_JOINT_HOMING_PARAMS:
730-
rtapi_print_msg(RTAPI_MSG_DBG, "UPDATE_JOINT_HOMING_PARAMS");
731-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
727+
rtapi_print_msg(RTAPI_MSG_DBG, "UPDATE_JOINT_HOMING_PARAMS %d", joint_num);
732728
emcmot_config_change();
733729
if (joint == 0) {
734730
break;
@@ -744,8 +740,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
744740
/* this command can be issued with joint < 0 to re-enable
745741
limits, but they are automatically re-enabled at the
746742
end of the next jog */
747-
rtapi_print_msg(RTAPI_MSG_DBG, "OVERRIDE_LIMITS");
748-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
743+
rtapi_print_msg(RTAPI_MSG_DBG, "OVERRIDE_LIMITS %d", joint_num);
749744
if (joint_num < 0) {
750745
/* don't override limits */
751746
rtapi_print_msg(RTAPI_MSG_DBG, "override off");
@@ -775,8 +770,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
775770
break;
776771

777772
case EMCMOT_SET_JOINT_MOTOR_OFFSET:
778-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_MOTOR_OFFSET");
779-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
773+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_MOTOR_OFFSET %d", joint_num);
780774
if(joint == 0) {
781775
break;
782776
}
@@ -786,8 +780,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
786780
case EMCMOT_SET_JOINT_POSITION_LIMITS:
787781
/* set the position limits for the joint */
788782
/* can be done at any time */
789-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_POSITION_LIMITS");
790-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
783+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_POSITION_LIMITS %d", joint_num);
791784
emcmot_config_change();
792785
if (joint == 0) {
793786
break;
@@ -799,8 +792,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
799792
case EMCMOT_SET_JOINT_BACKLASH:
800793
/* set the backlash for the joint */
801794
/* can be done at any time */
802-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_BACKLASH");
803-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
795+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_BACKLASH %d", joint_num);
804796
emcmot_config_change();
805797
if (joint == 0) {
806798
break;
@@ -815,8 +807,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
815807
minFerror then OK else if ferror < limiting ferror then OK
816808
else ERROR */
817809
case EMCMOT_SET_JOINT_MAX_FERROR:
818-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_MAX_FERROR");
819-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
810+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_MAX_FERROR %d", joint_num);
820811
emcmot_config_change();
821812
if (joint == 0 || emcmotCommand->maxFerror < 0.0) {
822813
break;
@@ -825,8 +816,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
825816
break;
826817

827818
case EMCMOT_SET_JOINT_MIN_FERROR:
828-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_MIN_FERROR");
829-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
819+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_MIN_FERROR %d", joint_num);
830820
emcmot_config_change();
831821
if (joint == 0 || emcmotCommand->minFerror < 0.0) {
832822
break;
@@ -838,8 +828,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
838828
/* do a continuous jog, implemented as an incremental jog to the
839829
limit. When the user lets go of the button an abort will
840830
stop the jog. */
841-
rtapi_print_msg(RTAPI_MSG_DBG, "JOG_CONT");
842-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
831+
rtapi_print_msg(RTAPI_MSG_DBG, "JOG_CONT %d", joint_num);
843832
if (!GET_MOTION_ENABLE_FLAG()) {
844833
reportError(_("Can't jog joint when not enabled."));
845834
SET_JOINT_ERROR_FLAG(joint, 1);
@@ -907,8 +896,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
907896

908897
case EMCMOT_JOG_INCR:
909898
/* do an incremental jog */
910-
rtapi_print_msg(RTAPI_MSG_DBG, "JOG_INCR");
911-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
899+
rtapi_print_msg(RTAPI_MSG_DBG, "JOG_INCR %d", joint_num);
912900
if (!GET_MOTION_ENABLE_FLAG()) {
913901
reportError(_("Can't jog joint when not enabled."));
914902
SET_JOINT_ERROR_FLAG(joint, 1);
@@ -984,8 +972,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
984972

985973
case EMCMOT_JOG_ABS:
986974
/* do an absolute jog */
987-
rtapi_print_msg(RTAPI_MSG_DBG, "JOG_ABS");
988-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
975+
rtapi_print_msg(RTAPI_MSG_DBG, "JOG_ABS %d", joint_num);
989976
if (joint == 0) {
990977
break;
991978
}
@@ -1208,8 +1195,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
12081195
case EMCMOT_SET_JOINT_VEL_LIMIT:
12091196
/* set joint max velocity */
12101197
/* can do it at any time */
1211-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_VEL_LIMIT");
1212-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
1198+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_VEL_LIMIT %d", joint_num);
12131199
emcmot_config_change();
12141200
/* check joint range */
12151201
if (joint == 0) {
@@ -1221,8 +1207,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
12211207
case EMCMOT_SET_JOINT_ACC_LIMIT:
12221208
/* set joint max acceleration */
12231209
/* can do it at any time */
1224-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_ACC_LIMIT");
1225-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
1210+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_ACC_LIMIT %d", joint_num);
12261211
emcmot_config_change();
12271212
/* check joint range */
12281213
if (joint == 0) {
@@ -1234,8 +1219,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
12341219
case EMCMOT_SET_JOINT_JERK_LIMIT:
12351220
/* set joint max jerk */
12361221
/* can do it at any time */
1237-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_JERK_LIMIT");
1238-
rtapi_print_msg(RTAPI_MSG_DBG, " j(%d) jerk(%f)", joint_num, emcmotCommand->jerk);
1222+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_JOINT_JERK_LIMIT j(%d) jerk(%f)", joint_num, emcmotCommand->jerk);
12391223
emcmot_config_change();
12401224
if (joint == 0) {
12411225
break;
@@ -1483,8 +1467,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
14831467
/* make joint active, so that amps will be enabled when system is
14841468
enabled or disabled */
14851469
/* can be done at any time */
1486-
rtapi_print_msg(RTAPI_MSG_DBG, "JOINT_ACTIVATE");
1487-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
1470+
rtapi_print_msg(RTAPI_MSG_DBG, "JOINT_ACTIVATE %d", joint_num);
14881471
if (joint == 0) {
14891472
break;
14901473
}
@@ -1495,8 +1478,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
14951478
/* make joint inactive, so that amps won't be affected when system
14961479
is enabled or disabled */
14971480
/* can be done at any time */
1498-
rtapi_print_msg(RTAPI_MSG_DBG, "JOINT_DEACTIVATE");
1499-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
1481+
rtapi_print_msg(RTAPI_MSG_DBG, "JOINT_DEACTIVATE %d", joint_num);
15001482
if (joint == 0) {
15011483
break;
15021484
}
@@ -1508,8 +1490,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
15081490
/* need to be in free mode, enable on */
15091491
/* this just sets the initial state, then the state machine in
15101492
homing.c does the rest */
1511-
rtapi_print_msg(RTAPI_MSG_DBG, "JOINT_HOME");
1512-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
1493+
rtapi_print_msg(RTAPI_MSG_DBG, "JOINT_HOME %d", joint_num);
15131494

15141495
/* Normally homing requires free (joint) mode. The queued G28.2 path
15151496
* (emctaskmain EMC_TASK_EXEC::WAITING_FOR_HOMING) dips motion into
@@ -1550,8 +1531,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
15501531

15511532
case EMCMOT_JOINT_UNHOME:
15521533
/* unhome the specified joint, or all joints if -1, or volatile joints if -2 */
1553-
rtapi_print_msg(RTAPI_MSG_DBG, "JOINT_UNHOME");
1554-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", joint_num);
1534+
rtapi_print_msg(RTAPI_MSG_DBG, "JOINT_UNHOME %d", joint_num);
15551535

15561536
if ( (emcmotStatus->motion_state != EMCMOT_MOTION_FREE)
15571537
&& (emcmotStatus->motion_state != EMCMOT_MOTION_DISABLED)) {
@@ -2043,8 +2023,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
20432023
case EMCMOT_SET_AXIS_POSITION_LIMITS:
20442024
/* set the position limits for axis */
20452025
/* can be done at any time */
2046-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_AXIS_POSITION_LIMITS");
2047-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", emcmotCommand->axis);
2026+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_AXIS_POSITION_LIMITS %d", emcmotCommand->axis);
20482027
emcmot_config_change();
20492028
if ((emcmotCommand->axis < 0) || (emcmotCommand->axis >= EMCMOT_MAX_AXIS)) {
20502029
break;
@@ -2056,8 +2035,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
20562035
case EMCMOT_SET_AXIS_VEL_LIMIT:
20572036
/* set the max axis vel */
20582037
/* can be done at any time */
2059-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_AXIS_VEL_LIMITS");
2060-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", emcmotCommand->axis);
2038+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_AXIS_VEL_LIMITS %d", emcmotCommand->axis);
20612039
emcmot_config_change();
20622040
if ((emcmotCommand->axis < 0) || (emcmotCommand->axis >= EMCMOT_MAX_AXIS)) {
20632041
break;
@@ -2069,8 +2047,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
20692047
case EMCMOT_SET_AXIS_ACC_LIMIT:
20702048
/* set the max axis acc */
20712049
/* can be done at any time */
2072-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_AXIS_ACC_LIMITS");
2073-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", emcmotCommand->axis);
2050+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_AXIS_ACC_LIMITS %d", emcmotCommand->axis);
20742051
emcmot_config_change();
20752052
if ((emcmotCommand->axis < 0) || (emcmotCommand->axis >= EMCMOT_MAX_AXIS)) {
20762053
break;
@@ -2082,8 +2059,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
20822059
case EMCMOT_SET_AXIS_JERK_LIMIT:
20832060
/* set the max axis jerk */
20842061
/* can be done at any time */
2085-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_AXIS_JERK_LIMITS");
2086-
rtapi_print_msg(RTAPI_MSG_DBG, " %d jerk(%f)", emcmotCommand->axis, emcmotCommand->jerk);
2062+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_AXIS_JERK_LIMITS %d jerk(%f)", emcmotCommand->axis, emcmotCommand->jerk);
20872063
emcmot_config_change();
20882064
if ((emcmotCommand->axis < 0) || (emcmotCommand->axis >= EMCMOT_MAX_AXIS)) {
20892065
break;
@@ -2092,8 +2068,7 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
20922068
break;
20932069

20942070
case EMCMOT_SET_AXIS_LOCKING_JOINT:
2095-
rtapi_print_msg(RTAPI_MSG_DBG, "SET_AXIS_ACC_LOCKING_JOINT");
2096-
rtapi_print_msg(RTAPI_MSG_DBG, " %d", emcmotCommand->axis);
2071+
rtapi_print_msg(RTAPI_MSG_DBG, "SET_AXIS_ACC_LOCKING_JOINT %d", emcmotCommand->axis);
20972072
emcmot_config_change();
20982073
if ((emcmotCommand->axis < 0) || (emcmotCommand->axis >= EMCMOT_MAX_AXIS)) {
20992074
break;
@@ -2139,7 +2114,6 @@ void emcmotCommandHandler_locked(void *arg, long servo_period)
21392114
rtapi_print_msg(RTAPI_MSG_DBG, "ERROR: %d",
21402115
emcmotStatus->commandStatus);
21412116
}
2142-
rtapi_print_msg(RTAPI_MSG_DBG, "\n");
21432117
/* synch tail count */
21442118
rtapi_seqlock_write_end(&emcmotStatus->tail, &emcmotStatus->head);
21452119
rtapi_seqlock_write_end(&emcmotConfig->tail, &emcmotConfig->head);

‎src/emc/motion/motion.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ void reportError(const char *fmt, ...)
224224
char fmt_tmp[EMCMOT_ERROR_LEN];
225225
size_t fmt_len = strlen(fmt);
226226
//Manually check string length and truncate if it is to long
227+
if(fmt_len > 0 && fmt[fmt_len-1] == '\n'){
228+
fmt_len--;
229+
}
227230
if(fmt_len < EMCMOT_ERROR_LEN-1){
228231
memcpy(fmt_tmp, fmt, fmt_len);
229232
fmt_tmp[fmt_len+0] = '\n';

‎src/emc/task/emctaskmain.cc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,11 @@ static int emcOperatorErrorV(bool echo, const char *fmt, va_list ap)
222222
// force a NULL at the end for safety
223223
error_msg.error[LINELEN - 1] = 0;
224224

225+
// an error is one line: the GUI and the echo below end it
226+
size_t n = strlen(error_msg.error);
227+
while (n > 0 && error_msg.error[n - 1] == '\n')
228+
error_msg.error[--n] = 0;
229+
225230
// write it
226231
if (echo) {
227232
log_info("{}\n", error_msg.error);

‎src/hal/drivers/hal_ppmc.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -566,22 +566,21 @@ int rtapi_app_main(void)
566566
slot = &(bus->slot_data[slotnum]);
567567
/* rv1 is used to flag errors that fail one bus */
568568
rv1 = 0;
569-
rtapi_print_msg(RTAPI_MSG_INFO, "PPMC: slot %d: ", slotnum);
570-
569+
571570
/* check slot */
572571
idcode = SelRead(slot->slot_base+SLOT_ID_OFFSET, slot->port_addr);
573572
if ((idcode == 0)||(idcode == 0xFF)||((idcode&0x0f) == 0x0f)) {
574573
// version of 0x0f will not be used so we can detect SLOT_ID_OFFSET
575574
// being left on the bus by a non-implemented device slot
576575
slot->id = 0;
577576
slot->ver = 0;
578-
rtapi_print_msg(RTAPI_MSG_INFO, "nothing detected at addr %x reads %x\n",
579-
slotnum,idcode);
577+
rtapi_print_msg(RTAPI_MSG_INFO, "PPMC: slot %d: nothing detected at addr %x reads %x\n",
578+
slotnum,slotnum,idcode);
580579
ClrTimeout(slot->port_addr);
581580
/* skip to next slot */
582581
continue;
583582
}
584-
rtapi_print_msg(RTAPI_MSG_INFO, "ID code: %02X ", idcode);
583+
rtapi_print_msg(RTAPI_MSG_INFO, "PPMC: slot %d: ID code: %02X\n", slotnum, idcode);
585584
slot->id = id = idcode & 0xF0;
586585
slot->ver = ver = idcode & 0x0F;
587586
slot->use_timestamp = 0; /* default is no timestamp */

‎src/hal/drivers/mesa-hostmot2/hm2_modbus.c‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,20 @@ static inline unsigned mtypesize(unsigned mtype) {
151151
#define MSG_WARN(fmt...) do { rtapi_print_msg(RTAPI_MSG_WARN, fmt); } while(0)
152152
#define MSG_PRINT(fmt...) do { rtapi_print(fmt); } while(0)
153153

154+
#ifdef DEBUG
155+
// Debug dump of a frame, one message for every 16 bytes
156+
static void dump_frame(const char *what, unsigned cmdidx, const rtapi_u8 *data, unsigned len)
157+
{
158+
for(unsigned i = 0; i < len; i += 16) {
159+
char hex[16 * 3 + 1] = "";
160+
unsigned n = 0;
161+
for(unsigned j = i; j < len && j < i + 16; j++)
162+
n += rtapi_snprintf(hex + n, sizeof(hex) - n, " %02x", data[j]);
163+
MSG_DBG("%s cmd=%u [%u]:%s\n", what, cmdidx, i, hex);
164+
}
165+
}
166+
#endif
167+
154168
// State-machine states
155169
enum {
156170
STATE_START = 0,
@@ -495,9 +509,8 @@ static int send_modbus_pkt(hm2_modbus_inst_t *inst)
495509
cc->data[cc->datalen++] = (checksum >> 8) & 0xff;
496510

497511
#ifdef DEBUG
498-
MSG_DBG("Sending cmd=%u to '%s' %i bytes", inst->cmdidx, inst->uart, cc->datalen);
499-
for(int i = 0; i < cc->datalen; i++) MSG_DBG(" 0x%02x", cc->data[i]);
500-
MSG_DBG("\n");
512+
MSG_DBG("Sending cmd=%u to '%s' %i bytes\n", inst->cmdidx, inst->uart, cc->datalen);
513+
dump_frame("Sending", inst->cmdidx, cc->data, cc->datalen);
501514
#endif
502515

503516
rtapi_u8 frames = 1;
@@ -1719,13 +1732,13 @@ static int parse_data_frame(hm2_modbus_inst_t *inst)
17191732
return -1;
17201733
}
17211734

1722-
MSG_DBG("Return PDU cmd=%u is", inst->cmdidx);
17231735
for(unsigned i = 0; i < rxcount; i++) {
17241736
bytes[i] = (data[w] >> b) & 0xFF;
1725-
MSG_DBG(" %02x", bytes[i]);
17261737
if((b += 8) >= 32) { b = 0; w++; }
17271738
}
1728-
MSG_DBG("\n");
1739+
#ifdef DEBUG
1740+
dump_frame("Return PDU", inst->cmdidx, bytes, rxcount);
1741+
#endif
17291742

17301743
if(bytes[0] != cc->cmd.mbid) {
17311744
MSG_ERR("%s: error: Modbus device address mismatch: got 0x%02x, expected 0x%02x\n", inst->name, bytes[0], cc->cmd.mbid);

‎src/hal/utils/halcmd.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,14 +212,17 @@ pid_t hal_systemv_nowait(const char *const argv[]) {
212212
if ( pid == 0 ) {
213213
/* child process */
214214
/* print debugging info if "very verbose" (-V) */
215+
char cmdline[1024] = "";
215216
for(n=0; argv[n] != NULL; n++) {
216-
rtapi_print_msg(RTAPI_MSG_DBG, "%s ", argv[n] );
217+
if (n)
218+
strncat(cmdline, " ", sizeof(cmdline) - strlen(cmdline) - 1);
219+
strncat(cmdline, argv[n], sizeof(cmdline) - strlen(cmdline) - 1);
217220
}
218221
if (n == 0) {
219222
halcmd_error("hal_systemv_nowait: empty argv array passed in\n");
220223
exit(1);
221224
}
222-
rtapi_print_msg(RTAPI_MSG_DBG, "\n" );
225+
rtapi_print_msg(RTAPI_MSG_DBG, "%s\n", cmdline);
223226
/* call execv() to invoke command */
224227
execvp(argv[0], (char * const *)argv);
225228
/* should never get here */

‎src/rtapi/rtai_rtapi.c‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,10 +433,19 @@ int rtapi_snprintf(char *buf, unsigned long int size, const char *fmt, ...)
433433

434434
#define BUFFERLEN 1024
435435

436+
/* Every rtapi_print_msg() message is one line: end one that lacks the
437+
newline. rtapi_print() (RTAPI_MSG_ALL) prints like printf. */
436438
void default_rtapi_msg_handler(msg_level_t level, const char *fmt, va_list ap) {
437439
char buf[BUFFERLEN];
438-
rtapi_vsnprintf(buf, BUFFERLEN, fmt, ap);
439-
rt_printk(buf);
440+
size_t n;
441+
/* leave room for the newline */
442+
rtapi_vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
443+
n = strlen(buf);
444+
if (level != RTAPI_MSG_ALL && n > 0 && buf[n - 1] != '\n') {
445+
buf[n] = '\n';
446+
buf[n + 1] = '\0';
447+
}
448+
rt_printk("%s", buf);
440449
}
441450
static rtapi_msg_handler_t rtapi_msg_handler = default_rtapi_msg_handler;
442451

0 commit comments

Comments
 (0)