i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bin/urlwrapper: Fix -Wmisleading-indentation

Browse Source 
Fix misleadingly indented printf() at line 142.

Change-Id: I498d171db6a09425901a13d52a8b2eca1413a068
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3342
Reviewed-by: Jérôme Duval <[email protected]>
This commit is contained in:
Murai Takashi
2020-10-23 07:09:20 +00:00
committed by Jérôme Duval
parent 1363e29b52
commit 2613144749
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/urlwrapper.cpp
+24 -23
View File
@@ -57,14 +57,14 @@ UrlWrapper::_Warn(const char* url)
message << "\n" << url << "\n\n"; message << "\n" << url << "\n\n";
message << "This type of URL has a potential security risk.\n"; message << "This type of URL has a potential security risk.\n";
message << "Proceed anyway?"; message << "Proceed anyway?";
BAlert* alert = new BAlert("Warning", message.String(), "Proceed", "Stop", NULL, BAlert* alert = new BAlert("Warning", message.String(), "Proceed", "Stop",
B_WIDTH_AS_USUAL, B_WARNING_ALERT); NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
alert->SetShortcut(1, B_ESCAPE); alert->SetShortcut(1, B_ESCAPE);
int32 button; int32 button;
button = alert->Go(); button = alert->Go();
if (button == 0) if (button == 0)
return B_OK; return B_OK;
return B_ERROR; return B_ERROR;
} }
@@ -139,9 +139,10 @@ UrlWrapper::RefsReceived(BMessage* msg)
const char bplist_match[] = "bplist00\xd1\x01\x02SURL_\x10"; const char bplist_match[] = "bplist00\xd1\x01\x02SURL_\x10";
if (f.ReadAt(0LL, buffer, size) < B_OK) if (f.ReadAt(0LL, buffer, size) < B_OK)
continue; continue;
printf("webloc\n"); printf("webloc\n");
if (size > (sizeof(bplist_match) + 2) if (size > (sizeof(bplist_match) + 2)
&& !strncmp(buffer, bplist_match, sizeof(bplist_match) - 1)) { && !strncmp(buffer, bplist_match,
sizeof(bplist_match) - 1)) {
// binary plist, let's be crude // binary plist, let's be crude
uint8 len = buffer[sizeof(bplist_match) - 1]; uint8 len = buffer[sizeof(bplist_match) - 1];
url.SetTo(buffer + sizeof(bplist_match), len); url.SetTo(buffer + sizeof(bplist_match), len);
@@ -228,7 +229,7 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
{ {
if (argc <= 1) if (argc <= 1)
return; return;
const char* failc = " || read -p 'Press any key'"; const char* failc = " || read -p 'Press any key'";
const char* pausec = " ; read -p 'Press any key'"; const char* pausec = " ; read -p 'Press any key'";
char* args[] = { (char *)"/bin/sh", (char *)"-c", NULL, NULL}; char* args[] = { (char *)"/bin/sh", (char *)"-c", NULL, NULL};
@@ -248,7 +249,7 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
fprintf(stderr, "malformed url: '%s'\n", url.UrlString().String()); fprintf(stderr, "malformed url: '%s'\n", url.UrlString().String());
return; return;
} }
// XXX: debug // XXX: debug
PRINT(("PROTO='%s'\n", proto.String())); PRINT(("PROTO='%s'\n", proto.String()));
PRINT(("HOST='%s'\n", host.String())); PRINT(("HOST='%s'\n", host.String()));
@@ -273,7 +274,7 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
be_roster->Launch("application/x-vnd.Haiku-About"); be_roster->Launch("application/x-vnd.Haiku-About");
return; return;
} }
if (proto == "telnet") { if (proto == "telnet") {
BString cmd("telnet "); BString cmd("telnet ");
if (url.HasUserInfo()) if (url.HasUserInfo())
@@ -287,12 +288,12 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
be_roster->Launch(kTerminalSig, 3, args); be_roster->Launch(kTerminalSig, 3, args);
return; return;
} }
// see draft: // see draft:
// http://tools.ietf.org/wg/secsh/draft-ietf-secsh-scp-sftp-ssh-uri/ // http://tools.ietf.org/wg/secsh/draft-ietf-secsh-scp-sftp-ssh-uri/
if (proto == "ssh") { if (proto == "ssh") {
BString cmd("ssh "); BString cmd("ssh ");
if (url.HasUserInfo()) if (url.HasUserInfo())
cmd << "-l " << user << " "; cmd << "-l " << user << " ";
if (url.HasPort()) if (url.HasPort())
@@ -308,7 +309,7 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
if (proto == "ftp") { if (proto == "ftp") {
BString cmd("ftp "); BString cmd("ftp ");
cmd << proto << "://"; cmd << proto << "://";
/* /*
if (user.Length()) if (user.Length())
@@ -323,10 +324,10 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
// TODO: handle errors // TODO: handle errors
return; return;
} }
if (proto == "sftp") { if (proto == "sftp") {
BString cmd("sftp "); BString cmd("sftp ");
//cmd << url; //cmd << url;
if (url.HasPort()) if (url.HasPort())
cmd << "-oPort=" << port << " "; cmd << "-oPort=" << port << " ";
@@ -345,7 +346,7 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
if (proto == "finger") { if (proto == "finger") {
BString cmd("/bin/finger "); BString cmd("/bin/finger ");
if (url.HasUserInfo()) if (url.HasUserInfo())
cmd << user; cmd << user;
if (url.HasHost() == 0) if (url.HasHost() == 0)
@@ -361,7 +362,7 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
if (proto == "http" || proto == "https" /*|| proto == "ftp"*/) { if (proto == "http" || proto == "https" /*|| proto == "ftp"*/) {
BString cmd("/bin/wget "); BString cmd("/bin/wget ");
//cmd << url; //cmd << url;
cmd << proto << "://"; cmd << proto << "://";
if (url.HasUserInfo()) if (url.HasUserInfo())
@@ -393,10 +394,10 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
qname << getpid() << "-" << system_time(); qname << getpid() << "-" << system_time();
BFile query(qname.String(), O_CREAT|O_EXCL); BFile query(qname.String(), O_CREAT|O_EXCL);
// XXX: should check for failure // XXX: should check for failure
BString s; BString s;
int32 v; int32 v;
_DecodeUrlString(full); _DecodeUrlString(full);
// TODO: handle options (list of attrs in the column, ...) // TODO: handle options (list of attrs in the column, ...)
@@ -413,7 +414,7 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
s.Length()+1); s.Length()+1);
s = "application/x-vnd.Be-query"; s = "application/x-vnd.Be-query";
query.WriteAttr("BEOS:TYPE", 'MIMS', 0LL, s.String(), s.Length()+1); query.WriteAttr("BEOS:TYPE", 'MIMS', 0LL, s.String(), s.Length()+1);
BEntry e(qname.String()); BEntry e(qname.String());
entry_ref er; entry_ref er;
@@ -446,7 +447,7 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
BMessage mserver('serv'); BMessage mserver('serv');
mserver.AddString("server", host); mserver.AddString("server", host);
msgr.SendMessage(&mserver); msgr.SendMessage(&mserver);
} }
if (url.HasPath()) { if (url.HasPath()) {
BMessage mquery('quer'); BMessage mquery('quer');
@@ -466,7 +467,7 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
BMessage mserver(B_REFS_RECEIVED); BMessage mserver(B_REFS_RECEIVED);
mserver.AddString("server", host); mserver.AddString("server", host);
msgr.SendMessage(&mserver); msgr.SendMessage(&mserver);
} }
// TODO: handle errors // TODO: handle errors
return; return;
@@ -544,7 +545,7 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
vnc: ? vnc: ?
irc: ? irc: ?
im: http://tools.ietf.org/html/rfc3860 im: http://tools.ietf.org/html/rfc3860
svn: handled by checkitout svn: handled by checkitout
cvs: handled by checkitout cvs: handled by checkitout
git: handled by checkitout git: handled by checkitout
@@ -572,7 +573,7 @@ UrlWrapper::ArgvReceived(int32 argc, char** argv)
data: (but it's dangerous) data: (but it's dangerous)
*/ */
} }
@@ -593,7 +594,7 @@ UrlWrapper::_DecodeUrlString(BString& string)
length -= 2; length -= 2;
} }
} }
return B_OK; return B_OK;
} }