From cdf1abf190f1097c4f6ae2ff0a9fa023df6982f1 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Sat, 12 Oct 2019 22:41:01 -0400 Subject: Applied debian patch to fix compiler warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 0014-fix-implicit-declarations-incompatible-types-argv-ty.patch From: Jan Date: Sat, 2 Mar 2019 15:41:59 +0100 Subject: fix: implicit declarations, incompatible types, argv type MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Fixed a few compiler warnings: prot.c:13:7: warning: implicit declaration of function ‘setgroups’ [-Wimplicit-function-declaration] chpst.c:80:7: warning: implicit declaration of function ‘setgroups’; did you mean ‘getgroups’? [-Wimplicit-function-declaration] - added #include , see: https://linux.die.net/man/2/setgroups chkshsgr.c:11:19: warning: passing argument 2 of ‘getgroups’ from incompatible pointer type [-Wincompatible-pointer-types] - change 'short' to 'gid_t', see: https://linux.die.net/man/2/setgroups pathexec_run.c:18:5: warning: implicit declaration of function ‘execve’ [-Wimplicit-function-declaration] - add #include , see: http://man7.org/linux/man-pages/man2/execve.2.html prot.c:17:10: warning: implicit declaration of function ‘setgid’; did you mean ‘getgrgid’? [-Wimplicit-function-declaration] - add #include , see: https://linux.die.net/man/3/setgid seek_set.c:9:7: warning: implicit declaration of function ‘lseek’ [-Wimplicit-function-declaration] - add #include , see: https://linux.die.net/man/2/lseek -------------------------------------- Fixed type of argv, from 'const char **argv' to 'char **argv' This resolves a lot of compiler typecast warnings like: pathexec_run.c:19:17: warning: passing argument 2 of ‘execve’ from incompatible pointer type [-Wincompatible-pointer-types] NOTE: this change might be disputable and not obvious at first. For arguments for argv as 'char **argv', see: The C Programming Language, Kernighan & Ritchie, Second Edition, Section 5.10, page 110 Command-line Arguments: main(int argc, char *argv[]) From https://riptutorial.com/c/example/3675/original--hello--world---in-k-r-c int main(int argc, char **argv) From C/C++ Kompendium (DE), Markt+Technik Verlag 2000, page 576, Chapter 12, main() Parameter: int main(int argc, char *argv[]) From http://www.cplusplus.com/articles/DEN36Up4/ int main(int argc, char* argv[]) // or char** argv From https://ece.uwaterloo.ca/~dwharder/icsrts/C/05/ int main( int argc, char *argv[] ) At https://stackoverflow.com/questions/5808679/why-is-main-argument-argv-of-type-char-rather-than-const-char is argued, that: - argv isn't const, since it's being created at runtime - in certain cases you should be able to rewrite argv from you program The main argument for this type change: the argv is used in a call to execve, so the type should be declared as compatible with execve parameters. http://man7.org/linux/man-pages/man2/execve.2.html defines: int execve(const char *filename, char *const argv[], char *const envp[]); so every argv defined as 'const char *const argv[]' was changed to: 'char *const argv[]' --- chpst.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'chpst.c') diff --git a/chpst.c b/chpst.c index f1b8ed9..2b9eb01 100644 --- a/chpst.c +++ b/chpst.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "sgetopt.h" #include "error.h" #include "strerr.h" @@ -40,7 +41,7 @@ void usage() { strerr_die4x(100, "usage: ", progname, USAGE_MAIN, "\n"); } char *set_user =0; char *env_user =0; -const char *argv0 =0; +char *argv0 =0; const char *env_dir =0; unsigned int verbose =0; unsigned int pgrp =0; @@ -258,14 +259,14 @@ void slimit() { } /* argv[0] */ -void setuidgid(int, const char *const *); -void envuidgid(int, const char *const *); -void envdir(int, const char *const *); -void pgrphack(int, const char *const *); -void setlock(int, const char *const *); -void softlimit(int, const char *const *); - -int main(int argc, const char **argv) { +void setuidgid(int, char *const *); +void envuidgid(int, char *const *); +void envdir(int, char *const *); +void pgrphack(int, char *const *); +void setlock(int, char *const *); +void softlimit(int, char *const *); + +int main(int argc, char **argv) { int opt; int i; unsigned long ul; @@ -366,7 +367,7 @@ int main(int argc, const char **argv) { void setuidgid_usage() { strerr_die4x(100, "usage: ", progname, USAGE_SETUIDGID, "\n"); } -void setuidgid(int argc, const char *const *argv) { +void setuidgid(int argc, char *const *argv) { const char *account; if (! (account =*++argv)) setuidgid_usage(); @@ -379,7 +380,7 @@ void setuidgid(int argc, const char *const *argv) { void envuidgid_usage() { strerr_die4x(100, "usage: ", progname, USAGE_ENVUIDGID, "\n"); } -void envuidgid(int argc, const char *const *argv) { +void envuidgid(int argc, char *const *argv) { const char *account; if (! (account =*++argv)) envuidgid_usage(); @@ -392,7 +393,7 @@ void envuidgid(int argc, const char *const *argv) { void envdir_usage() { strerr_die4x(100, "usage: ", progname, USAGE_ENVDIR, "\n"); } -void envdir(int argc, const char *const *argv) { +void envdir(int argc, char *const *argv) { const char *dir; if (! (dir =*++argv)) envdir_usage(); @@ -405,7 +406,7 @@ void envdir(int argc, const char *const *argv) { void pgrphack_usage() { strerr_die4x(100, "usage: ", progname, USAGE_PGRPHACK, "\n"); } -void pgrphack(int argc, const char *const *argv) { +void pgrphack(int argc, char *const *argv) { if (! *++argv) pgrphack_usage(); setsid(); pathexec(argv); @@ -415,7 +416,7 @@ void pgrphack(int argc, const char *const *argv) { void setlock_usage() { strerr_die4x(100, "usage: ", progname, USAGE_SETLOCK, "\n"); } -void setlock(int argc, const char *const *argv) { +void setlock(int argc, char *const *argv) { int opt; unsigned int delay =0; unsigned int x =0; @@ -449,7 +450,7 @@ void getlarg(long *l) { if (optarg[scan_ulong(optarg, &ul)]) usage(); *l =ul; } -void softlimit(int argc, const char *const *argv) { +void softlimit(int argc, char *const *argv) { int opt; while ((opt =getopt(argc,argv,"a:c:d:f:l:m:o:p:r:s:t:")) != opteof) -- cgit v1.2.3