TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-15 22:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor code changes across all sources

Browse Source
This commit is contained in:
topjohnwu
2019-06-30 19:09:31 -07:00
parent db8dd9f186
commit ff3710de66
20 changed files with 50 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
native/jni/su/connect.cpp
View File

@@ -5,7 +5,6 @@
#include <fcntl.h>
#include <stdio.h>
#include <magisk.h>
#include <daemon.h>
#include <utils.h>

2
native/jni/su/pts.cpp
View File

@@ -17,7 +17,7 @@
#include <errno.h>
#include <pthread.h>
#include <magisk.h>
#include <logging.h>
#include "pts.h"

25
native/jni/su/su.cpp
View File

@@ -21,7 +21,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <magisk.h>
#include <daemon.h>
#include <utils.h>
#include <flags.h>
@@ -82,7 +81,7 @@ static void sighandler(int sig) {
memset(&act, 0, sizeof(act));
act.sa_handler = SIG_DFL;
for (int i = 0; quit_signals[i]; ++i) {
sigaction(quit_signals[i], &act, NULL);
sigaction(quit_signals[i], &act, nullptr);
}
}
@@ -91,7 +90,7 @@ static void setup_sighandlers(void (*handler)(int)) {
memset(&act, 0, sizeof(act));
act.sa_handler = handler;
for (int i = 0; quit_signals[i]; ++i) {
sigaction(quit_signals[i], &act, NULL);
sigaction(quit_signals[i], &act, nullptr);
}
}
@@ -107,15 +106,15 @@ su_request::su_request()
int su_client_main(int argc, char *argv[]) {
int c;
struct option long_opts[] = {
{ "command", required_argument, NULL, 'c' },
{ "help", no_argument, NULL, 'h' },
{ "login", no_argument, NULL, 'l' },
{ "preserve-environment", no_argument, NULL, 'p' },
{ "shell", required_argument, NULL, 's' },
{ "version", no_argument, NULL, 'v' },
{ "context", required_argument, NULL, 'z' },
{ "mount-master", no_argument, NULL, 'M' },
{ NULL, 0, NULL, 0 },
{ "command", required_argument, nullptr, 'c' },
{ "help", no_argument, nullptr, 'h' },
{ "login", no_argument, nullptr, 'l' },
{ "preserve-environment", no_argument, nullptr, 'p' },
{ "shell", required_argument, nullptr, 's' },
{ "version", no_argument, nullptr, 'v' },
{ "context", required_argument, nullptr, 'z' },
{ "mount-master", no_argument, nullptr, 'M' },
{ nullptr, 0, nullptr, 0 },
};
su_request su_req;
@@ -128,7 +127,7 @@ int su_client_main(int argc, char *argv[]) {
strcpy(argv[i], "-M");
}
while ((c = getopt_long(argc, argv, "c:hlmps:Vvuz:M", long_opts, NULL)) != -1) {
while ((c = getopt_long(argc, argv, "c:hlmps:Vvuz:M", long_opts, nullptr)) != -1) {
switch (c) {
case 'c':
su_req.command = concat_commands(argc, argv);

2
native/jni/su/su.h
View File

@@ -8,7 +8,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "db.h"
#include <db.h>
#define DEFAULT_SHELL "/system/bin/sh"

2
native/jni/su/su_daemon.cpp
View File

@@ -12,7 +12,7 @@
#include <sys/wait.h>
#include <sys/mount.h>
#include <magisk.h>
#include <logging.h>
#include <daemon.h>
#include <utils.h>
#include <selinux.h>