Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bda352f authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge changes from topic 'logcatd' 

* changes:
  init.rc: logd: Add logpersistd (nee logcatd)
  init: change exec parsing to make SECLABEL optional
  logcat: -f run in background
  logcat: -f flag to continue
parents 66e39275 100658c3

init/init.cpp

+2 −1
Original line number Diff line number Diff line
@@ -380,7 +380,8 @@ void service_start(struct service *svc, const char *dynamic_args) 


    if ((svc->flags & SVC_EXEC) != 0) {

        INFO("SVC_EXEC pid %d (uid %d gid %d+%zu context %s) started; waiting...\n",

             svc->pid, svc->uid, svc->gid, svc->nr_supp_gids, svc->seclabel);

             svc->pid, svc->uid, svc->gid, svc->nr_supp_gids,

             svc->seclabel ? : "default");

        waiting_for_exec = true;

    }

init/init_parser.cpp

+2 −1
Original line number Diff line number Diff line
@@ -664,6 +664,7 @@ int action_queue_empty() 


service* make_exec_oneshot_service(int nargs, char** args) {

    // Parse the arguments: exec [SECLABEL [UID [GID]*] --] COMMAND ARGS...

    // SECLABEL can be a - to denote default

    int command_arg = 1;

    for (int i = 1; i < nargs; ++i) {

        if (strcmp(args[i], "--") == 0) {
@@ -689,7 +690,7 @@ service* make_exec_oneshot_service(int nargs, char** args) { 
        return NULL;

    }



    if (command_arg > 2) {

    if ((command_arg > 2) && strcmp(args[1], "-")) {

        svc->seclabel = args[1];

    }

    if (command_arg > 3) {

init/readme.txt

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ exec [ <seclabel> [ <user> [ <group> ]* ] ] -- <command> [ <argument> ]* 
   Fork and execute command with the given arguments. The command starts

   after "--" so that an optional security context, user, and supplementary

   groups can be provided. No other commands will be run until this one

   finishes.

   finishes. <seclabel> can be a - to denote default.



export <name> <value>

   Set the environment variable <name> equal to <value> in the

liblog/log_time.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include <log/log_read.h>



const char log_time::default_format[] = "%m-%d %H:%M:%S.%3q";

const char log_time::default_format[] = "%m-%d %H:%M:%S.%q";

const timespec log_time::EPOCH = { 0, 0 };



// Add %#q for fractional seconds to standard strptime function

logcat/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES:= logcat.cpp event.logtags



LOCAL_SHARED_LIBRARIES := liblog

LOCAL_SHARED_LIBRARIES := liblog libbase libcutils



LOCAL_MODULE := logcat