util, refactor: Use GetPathArg to read "-rpccookiefile" value

hebasto · hebasto · commit 138c668e2b4d · 2022-04-21T12:55:31.000+02:00
diff --git a/src/rpc/request.cpp b/src/rpc/request.cpp
@@ -66,16 +66,16 @@ UniValue JSONRPCError(int code, const std::string& message)
  */
 static const std::string COOKIEAUTH_USER = "__cookie__";
 /** Default name for auth cookie file */
-static const std::string COOKIEAUTH_FILE = ".cookie";
+static const char* const COOKIEAUTH_FILE = ".cookie";
 
 /** Get name of RPC authentication cookie file */
 static fs::path GetAuthCookieFile(bool temp=false)
 {
-    std::string arg = gArgs.GetArg("-rpccookiefile", COOKIEAUTH_FILE);
+    fs::path arg = gArgs.GetPathArg("-rpccookiefile", COOKIEAUTH_FILE);
     if (temp) {
         arg += ".tmp";
     }
-    return AbsPathForConfigVal(fs::PathFromString(arg));
+    return AbsPathForConfigVal(arg);
 }
 
 bool GenerateAuthCookie(std::string *cookie_out)

Original file line number	Diff line number	Diff line change
`@@ -66,16 +66,16 @@ UniValue JSONRPCError(int code, const std::string& message)`
`66`	`66`	`*/`
`67`	`67`	`static const std::string COOKIEAUTH_USER = "__cookie__";`
`68`	`68`	`/** Default name for auth cookie file */`
`69`		`-static const std::string COOKIEAUTH_FILE = ".cookie";`
	`69`	`+static const char* const COOKIEAUTH_FILE = ".cookie";`
`70`	`70`
`71`	`71`	`/** Get name of RPC authentication cookie file */`
`72`	`72`	`static fs::path GetAuthCookieFile(bool temp=false)`
`73`	`73`	`{`
`74`		`- std::string arg = gArgs.GetArg("-rpccookiefile", COOKIEAUTH_FILE);`
	`74`	`+ fs::path arg = gArgs.GetPathArg("-rpccookiefile", COOKIEAUTH_FILE);`
`75`	`75`	`if (temp) {`
`76`	`76`	`arg += ".tmp";`
`77`	`77`	`}`
`78`		`- return AbsPathForConfigVal(fs::PathFromString(arg));`
	`78`	`+ return AbsPathForConfigVal(arg);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`bool GenerateAuthCookie(std::string *cookie_out)`