Skip to content

[OpenBSD] Add Missing Semicolons #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
klemens-morgenstern merged 23 commits into from Oct 29, 2024
Merged

[OpenBSD] Add Missing Semicolons #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
cdc6f52
Implement OpenBSD Executable PatH
Mar 28, 2023
eeb28f3
Static Cast Device and iNode
Mar 28, 2023
c113858
Add Name Spaces to Exe Checker
Mar 28, 2023
2219529
Strings to File System Paths
Mar 28, 2023
bdbf8f6
[skip ci] KVM_T to KMV_T Pointer
Mar 28, 2023
5705c42
[skip ci] C-String to FileSystem Path
Mar 29, 2023
65dbfa9
[skip ci] String to FileSystem Path
Mar 29, 2023
dce93b8
[skip ci] String to FileSystem Path
Mar 29, 2023
2b96699
[skip ci] String to FileSystem Path
Mar 29, 2023
88802c4
Add Forgotten Semicolon
Mar 29, 2023
ff798b0
[skip ci] Update Error Code Logic
Mar 29, 2023
8fb4c16
[skip ci] Add Error Code Argument
Mar 29, 2023
2c6901e
[skip ci] Clear Error Code on Success
Mar 29, 2023
de39bc7
[skip ci] Change Executable Verifier
Mar 29, 2023
fbeebd7
[skip ci] Change Executable Verifier
Mar 29, 2023
927af40
[skip ci] Replace Tabs with Four Spaces
Mar 29, 2023
fd2d1b8
[skip ci] replace semicolon with colon
Feb 13, 2024
3fd64ff
Initial Commit
Sep 27, 2024
1308338
sync with upstream
Sep 30, 2024
fdac9ea
Merge pull request #2 from boostorg/develop
Sep 30, 2024
9ce3b14
Merge pull request #4 from boostorg/develop
Oct 28, 2024
96d46b1
[OpenBSD] Add Missing Semicolons
Oct 29, 2024
8a7dd43
[OpenBSD] Add Missing Semicolons
Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/ext/cmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
};

std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nlistf, memf, nullptr, O_RDONLY, nullptr)};
if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) return {};}
if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec); return {};}
if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_PID, pid, &cntp)))
{
char **cmd = kvm_getargv(kd.get(), proc_info, 0);
Expand All @@ -301,8 +301,6 @@ shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)

shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
{

std::vector<std::string> vec;
int cntp = 0;
kinfo_proc2 *proc_info = nullptr;
struct closer
Expand All @@ -315,7 +313,7 @@ shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)

std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};

if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) return vec;}
if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec); return {};}
if ((proc_info = kvm_getproc2(kd.get(), KERN_PROC_PID, pid, sizeof(struct kinfo_proc2), &cntp)))
{
char **cmd = kvm_getargv2(kd.get(), proc_info, 0);
Expand All @@ -326,14 +324,13 @@ shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
}
else
BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
return vec;
return {};
}

#elif defined(__OpenBSD__)

shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
{
std::vector<std::string> vec;
int cntp = 0;
kinfo_proc *proc_info = nullptr;

Expand All @@ -346,7 +343,7 @@ shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
};

std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) return vec;}
if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec); return {};}
if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_PID, pid, sizeof(struct kinfo_proc), &cntp)))
{
char **cmd = kvm_getargv(kd.get(), proc_info, 0);
Expand All @@ -368,7 +365,7 @@ shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec)
proc *proc_info = nullptr;
user *proc_user = nullptr;
kvm_t *kd = kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr);
if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) return {};}
if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec); return {};}
if ((proc_info = kvm_getproc(kd, pid)))
{
if ((proc_user = kvm_getu(kd, proc_info)))
Expand Down
2 changes: 1 addition & 1 deletion src/ext/env.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ env_view env(boost::process::v2::pid_type pid, boost::system::error_code & ec)
};

std::unique_ptr<kvm_t, closer> kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)};
if (!kd.get()) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) return {};}
if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec); return {};}
if ((proc_info = kvm_getprocs(kd.get(), KERN_PROC_PID, pid, sizeof(struct kinfo_proc), &cntp)))
{
char **env = kvm_getenvv(kd.get(), proc_info, 0);
Expand Down