Skip to content
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

Jump to bottom

Implement safe io #871

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Implement safe io #871

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4bc40e6
Use safe-io
A6GibKm Dec 28, 2022
d1f4c68
Impl AsFd for types that implement AsRawFd
A6GibKm Dec 28, 2022
1b59edb
Port file_open_tmp to safe-io
A6GibKm Dec 28, 2022
0ece903
unix_fd_list: Port to safe-io
A6GibKm Dec 28, 2022
f2da19b
subprocess_launcher: Take owned fds
A6GibKm Dec 28, 2022
0eaccf9
unix_fd_add: Port to safe-io
A6GibKm Dec 28, 2022
42a95db
glib: Mark unix_open_pipe as unsafe
A6GibKm Dec 28, 2022
7b9e42e
spawn_async_with_fds: Mark as unsafe
A6GibKm Dec 28, 2022
578ed66
socket: Fix tests
A6GibKm Jun 3, 2024
bf6f65d
unix_streams: Rename and remove unsafe version
A6GibKm Jun 10, 2024
c82d4c4
wip: unix_fd_list: Use custom iterator for steal_fds
A6GibKm Jun 3, 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
Prev Previous commit
Next Next commit
Port file_open_tmp to safe-io
  • Loading branch information
@A6GibKm
A6GibKm committed Jun 10, 2024
commit 1b59edb365899d809e3120e3807defbe2e51b111
6 changes: 3 additions & 3 deletions glib/src/functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::mem;
#[cfg(feature = "v2_58")]
use std::os::unix::io::{AsFd, AsRawFd};
#[cfg(not(windows))]
use std::os::unix::io::{FromRawFd, IntoRawFd, RawFd};
use std::os::unix::io::{FromRawFd, OwnedFd, RawFd};
use std::ptr;

// #[cfg(windows)]
Expand Down Expand Up @@ -261,7 +261,7 @@ pub fn unix_open_pipe(flags: i32) -> Result<(RawFd, RawFd), Error> {
#[doc(alias = "g_file_open_tmp")]
pub fn file_open_tmp(
tmpl: Option<impl AsRef<std::path::Path>>,
) -> Result<(RawFd, std::path::PathBuf), crate::Error> {
) -> Result<(OwnedFd, std::path::PathBuf), crate::Error> {
unsafe {
let mut name_used = ptr::null_mut();
let mut error = ptr::null_mut();
Expand All @@ -271,7 +271,7 @@ pub fn file_open_tmp(
&mut error,
);
if error.is_null() {
Ok((ret.into_raw_fd(), from_glib_full(name_used)))
Ok((OwnedFd::from_raw_fd(ret), from_glib_full(name_used)))
} else {
Err(from_glib_full(error))
}
Expand Down