From 15039805f9dc6d9ad92102f8f14354d7f41d2fdf Mon Sep 17 00:00:00 2001 From: Emma Tebibyte Date: Tue, 28 Oct 2025 14:08:17 -0600 Subject: [PATCH] Makefile, libdelimit: update for including libdelimit in utilities --- Makefile | 11 ++++++++--- src/libdelimit.rs | 7 +++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index d104d7f..f853c85 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,8 @@ SYSEXITS != printf '\043include \n' | cpp -M - | tr ' ' '\n' \ CC ?= cc RUSTC ?= rustc -RUSTFLAGS += --extern getopt=build/o/libgetopt.rlib \ +RUSTFLAGS += --extern delimit=build/o/libdelimit.rlib \ + --extern getopt=build/o/libgetopt.rlib \ --extern strerror=build/o/libstrerror.rlib \ --extern sysexits=build/o/libsysexits.rlib CFLAGS += -I$(SYSEXITS) @@ -88,8 +89,12 @@ docs: docs/ build include $(OS_INCLUDE) .PHONY: rustlibs -rustlibs: build/o/libgetopt.rlib build/o/libstrerror.rlib \ - build/o/libsysexits.rlib $(OSLIB) +rustlibs: build/o/libdelimit.rlib build/o/libgetopt.rlib \ + build/o/libstrerror.rlib build/o/libsysexits.rlib $(OSLIB) + +build/o/libdelimit.rlib: build src/libdelimit.rs + $(RUSTC) $(RUSTFLAGS) --crate-type=lib --crate-name=delimit \ + -o $@ src/libdelimit.rs build/o/libgetopt.rlib: build src/libgetopt.rs $(RUSTC) $(RUSTFLAGS) --crate-type=lib --crate-name=getopt \ diff --git a/src/libdelimit.rs b/src/libdelimit.rs index 6e648cf..777fb96 100644 --- a/src/libdelimit.rs +++ b/src/libdelimit.rs @@ -17,21 +17,20 @@ */ use std::{ - io::{ Read, Result, stdin }, + io::{ Read, Result }, mem::self, - process::ExitCode, }; const BUFFER_SIZE: usize = 4096; -struct Delimited { +pub struct Delimited { stream: Box, delimiter: Vec, buffer: Vec } impl Delimited { - fn new(stream: Box, delimiter: &[u8]) -> Self { + pub fn new(stream: Box, delimiter: &[u8]) -> Self { Delimited { stream, delimiter: delimiter.to_vec(),