commit: 73771c877ce9eccdc0f5c60ae6ff6a933fa35181
parent 6e469ae866a97293762f5045f6eed8888a95a7ac
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Wed, 18 Jun 2025 13:54:56 +0200
synchronize strtodur with utils-std
Diffstat:
13 files changed, 595 insertions(+), 140 deletions(-)
diff --git a/.clang-format b/.clang-format
@@ -1,5 +1,5 @@
# SPDX-FileCopyrightText: 2025 Haelwenn (lanodan) Monnier <contact+cmd-timer@hacktivis.me>
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: MPL-2.0
AlignAfterOpenBracket: true
AlignConsecutiveAssignments: false
AlignOperands: true
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2025 Haelwenn (lanodan) Monnier <contact+cmd-timer@hacktivis.me>
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: MPL-2.0
*.o
/timer
-/test_strtodur
+/t_strtodur
diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt
@@ -1,18 +0,0 @@
-MIT License
-
-Copyright (c) <year> <copyright holders>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
-EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/LICENSES/MPL-2.0.txt b/LICENSES/MPL-2.0.txt
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+ means
+
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+
+1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+
+1.8. "License"
+ means this document.
+
+1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+
+1.10. "Modifications"
+ means any of the following:
+
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+
+1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+
+1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+
+1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+ or
+
+(b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+* *
+* 6. Disclaimer of Warranty *
+* ------------------------- *
+* *
+* Covered Software is provided under this License on an "as is" *
+* basis, without warranty of any kind, either expressed, implied, or *
+* statutory, including, without limitation, warranties that the *
+* Covered Software is free of defects, merchantable, fit for a *
+* particular purpose or non-infringing. The entire risk as to the *
+* quality and performance of the Covered Software is with You. *
+* Should any Covered Software prove defective in any respect, You *
+* (not any Contributor) assume the cost of any necessary servicing, *
+* repair, or correction. This disclaimer of warranty constitutes an *
+* essential part of this License. No use of any Covered Software is *
+* authorized under this License except under this disclaimer. *
+* *
+************************************************************************
+
+************************************************************************
+* *
+* 7. Limitation of Liability *
+* -------------------------- *
+* *
+* Under no circumstances and under no legal theory, whether tort *
+* (including negligence), contract, or otherwise, shall any *
+* Contributor, or anyone who distributes Covered Software as *
+* permitted above, be liable to You for any direct, indirect, *
+* special, incidental, or consequential damages of any character *
+* including, without limitation, damages for lost profits, loss of *
+* goodwill, work stoppage, computer failure or malfunction, or any *
+* and all other commercial damages or losses, even if such party *
+* shall have been informed of the possibility of such damages. This *
+* limitation of liability shall not apply to liability for death or *
+* personal injury resulting from such party's negligence to the *
+* extent applicable law prohibits such limitation. Some *
+* jurisdictions do not allow the exclusion or limitation of *
+* incidental or consequential damages, so this exclusion and *
+* limitation may not apply to You. *
+* *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
# SPDX-FileCopyrightText: 2025 Haelwenn (lanodan) Monnier <contact+cmd-timer@hacktivis.me>
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: MPL-2.0
PREFIX ?= /usr/local
BINDIR ?= ${PREFIX}/bin
@@ -10,18 +10,18 @@ MAN1DIR ?= ${MANDIR}/man1
${CC} -std=c99 ${CFLAGS} -c -o $@ $<
TIMER_SRC_C = timer.c strtodur.o
-timer: ${TIMER_SRC_C} timer.h
+timer: ${TIMER_SRC_C} strtodur.h
${CC} -std=c99 ${CFLAGS} -o $@ ${TIMER_SRC_C} ${LDFLAGS} ${LDSTATIC}
-TEST_STRTODUR_SRC_C = test_strtodur.c strtodur.o
-test_strtodur: ${TEST_STRTODUR_SRC_C} timer.h
+TEST_STRTODUR_SRC_C = t_strtodur.c strtodur.o
+t_strtodur: ${TEST_STRTODUR_SRC_C} strtodur.h
${CC} -std=c99 ${CFLAGS} -o $@ ${TEST_STRTODUR_SRC_C} ${LDFLAGS} ${LDSTATIC}
-check: test_strtodur
- ./test_strtodur
+check: t_strtodur
+ ./t_strtodur
clean:
- rm -f timer test_strtodur strtodur.o
+ rm -f timer t_strtodur strtodur.o
.PHONY: format
format:
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
# timer - run command at a specific interval
```
SPDX-FileCopyrightText: 2025 Haelwenn (lanodan) Monnier <contact+cmd-timer@hacktivis.me>
-SPDX-License-Identifier: MIT
+SPDX-License-Identifier: MPL-2.0
```
Extracted from the manpage (see [./timer.1](https://hacktivis.me/git/cmd-timer.mdoc/))
diff --git a/strtodur.c b/strtodur.c
@@ -1,65 +1,130 @@
-// SPDX-FileCopyrightText: 2025 Haelwenn (lanodan) Monnier <contact+cmd-timer@hacktivis.me>
-// SPDX-License-Identifier: MIT
+// utils-std: Collection of commonly available Unix tools
+// SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier <contact+utils@hacktivis.me>
+// SPDX-License-Identifier: MPL-2.0
#define _POSIX_C_SOURCE 200809L
-#include "timer.h"
+#include "strtodur.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h> // errno
+#include <stdio.h> // fprintf, perror, sscanf
+#include <string.h> // strerror
-unsigned long
-strtodur(char *s)
+const char *errstr_nan = "Not a number";
+
+int
+strtodur(char *s, struct timespec *dur)
{
- if(s == 0 || s[0] == '\0') return 0;
+ if(s == 0) return 0;
+
+ assert(dur);
- unsigned long dur = 0;
+ float total = 0.0;
while(*s != '\0')
{
- char *end = NULL;
- errno = 0;
- unsigned long tmp = strtoul(s, &end, 0);
- if(errno != 0)
+ float in = 0.0;
+
+ if(s[0] != '.' && s[0] != ',')
{
- fprintf(stderr,
- "timer: error: Failed parsing argument '%s' as integer: %s\n",
- s,
- strerror(errno));
- return 1;
+ int parsed = 0;
+ float res = 0.0;
+
+ errno = 0;
+ if(sscanf(s, "%10f%n", &res, &parsed) < 1)
+ {
+ const char *errstr = errstr_nan;
+ if(errno != 0)
+ {
+ errstr = strerror(errno);
+ errno = 0;
+ }
+
+ fprintf(
+ stderr, "%s: error: strtodur failed scanning '%s' as a number: %s\n", argv0, s, errstr);
+ return -1;
+ }
+
+ in += res;
+ s += parsed;
}
- if(end)
+ if((s[0] == '.' || s[0] == ','))
{
- s = end;
+ if(s[1] == '\0')
+ {
+ s++;
+ goto dot_skip;
+ }
+
+ float fraction = 0.0;
+ if(s[0] == ',') s[0] = '.';
- if(s[0] != '\0')
+ int parsed = 0;
+
+ errno = 0;
+ if(sscanf(s, "%10f%n", &fraction, &parsed) < 1)
{
- switch(s[0])
+ const char *errstr = errstr_nan;
+ if(errno != 0)
{
- case 's': // seconds
- break;
- case 'm': // minutes
- tmp *= 60;
- break;
- case 'h': // hours
- tmp *= 60 * 60;
- break;
- case 'd': // days
- tmp *= 24 * 60 * 60;
- break;
- default:
- fprintf(stderr, "timer: error: Unknown duration suffix '%c'\n", s[0]);
- return -1;
+ errstr = strerror(errno);
+ errno = 0;
}
- s++;
+ fprintf(stderr,
+ "%s: error: strtodur failed scanning decimal part '%s' as a number: %s\n",
+ argv0,
+ s,
+ errstr);
+ return -1;
+ }
+
+ if(parsed == 0) parsed++;
+
+ in += fraction;
+ s += parsed;
+ }
+
+ if(s[0] != '\0' && s[0] != ',' && s[0] != '.')
+ {
+ if(s[1] != '\0' && !isdigit(s[1]))
+ {
+ fprintf(stderr,
+ "%s: error: duration suffix '%s' is too long, should be only one character\n",
+ argv0,
+ s);
+ return -1;
}
+
+ switch(s[0])
+ {
+ case 's': // seconds
+ break;
+ case 'm': // minutes
+ in *= 60;
+ break;
+ case 'h': // hours
+ in *= 60 * 60;
+ break;
+ case 'd': // days
+ in *= 24 * 60 * 60;
+ break;
+ default:
+ fprintf(stderr, "%s: error: Unknown duration suffix '%c'\n", argv0, s[0]);
+ return -1;
+ }
+
+ s++;
}
- dur += tmp;
+ dot_skip:
+ total += in;
}
- return dur;
+ dur->tv_sec = total;
+ dur->tv_nsec = (total - dur->tv_sec) * 1000000000;
+
+ return 0;
}
diff --git a/strtodur.h b/strtodur.h
@@ -0,0 +1,9 @@
+// utils-std: Collection of commonly available Unix tools
+// SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier <contact+utils@hacktivis.me>
+// SPDX-License-Identifier: MPL-2.0
+
+#include <time.h> // timespec
+
+extern const char *argv0;
+
+int strtodur(char *s, struct timespec *dur);
diff --git a/t_strtodur.c b/t_strtodur.c
@@ -0,0 +1,83 @@
+// utils-std: Collection of commonly available Unix tools
+// SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier <contact+utils@hacktivis.me>
+// SPDX-License-Identifier: MPL-2.0
+
+#define _POSIX_C_SOURCE 200809L
+#include "strtodur.h"
+
+#include <assert.h>
+#include <stdio.h> // printf
+
+const char *argv0 = "t_strtodur";
+int counter = 0;
+int err = 0;
+
+static void
+t_strtodur(char *str, time_t ex_sec, long ex_nsec)
+{
+ int id = ++counter;
+
+ struct timespec dur = {.tv_sec = 0, .tv_nsec = 0};
+ int ret = strtodur(str, &dur);
+
+ if(dur.tv_sec == ex_sec && dur.tv_nsec == ex_nsec && ret == 0)
+ {
+ printf("ok %d - strtodur(\"%s\", _) -> {.tv_sec = %ld, .tv_nsec = %ld}\n",
+ id,
+ str,
+ dur.tv_sec,
+ dur.tv_nsec);
+ return;
+ }
+
+ err = 1;
+ printf("not ok %d - strtodur(\"%s\", _) -> {.tv_sec = %ld, .tv_nsec = %ld}\n",
+ id,
+ str,
+ dur.tv_sec,
+ dur.tv_nsec);
+ if(dur.tv_sec != ex_sec || dur.tv_nsec != ex_nsec)
+ printf("# Expected: {.tv_sec = %ld, .tv_nsec = %ld}\n", ex_sec, ex_nsec);
+ if(ret != 0) printf("# Exit status: %d\n", ret);
+}
+
+int
+main(void)
+{
+ int plan = 18;
+ printf("1..%d\n", plan);
+
+ // TODO: Capture errors, say with open_memstream(3)
+
+#define T_NSEC 1000000000
+#define T_MIN 60
+#define T_HOUR 60 * T_MIN
+#define T_DAY 24 * T_HOUR
+
+ t_strtodur(NULL, 0, 0);
+ t_strtodur((char *)"", 0, 0);
+ t_strtodur((char *)",", 0, 0);
+
+ t_strtodur((char *)"1", 1, 0);
+ t_strtodur((char *)"1.", 1, 0);
+ t_strtodur((char *)"1,", 1, 0);
+
+ t_strtodur((char *)".1", 0, T_NSEC * 0.1);
+ t_strtodur((char *)"0.1", 0, T_NSEC * 0.1);
+
+ t_strtodur((char *)"1s", 1, 0);
+ t_strtodur((char *)"1m", T_MIN, 0);
+ t_strtodur((char *)"1h", 1 * T_HOUR, 0);
+ t_strtodur((char *)"1d", 1 * T_DAY, 0);
+ t_strtodur((char *)"1d1h1m1s", (1 * T_DAY) + (1 * T_HOUR) + (1 * T_MIN) + 1, 0);
+
+ t_strtodur((char *)"1.5s", 1, T_NSEC * 0.5);
+ t_strtodur((char *)"1.5m", 1.5 * T_MIN, 0);
+ t_strtodur((char *)"1.5h", 1.5 * T_HOUR, 0);
+ t_strtodur((char *)"1.5d", 1.5 * T_DAY, 0);
+ t_strtodur(
+ (char *)"1.5d1.5h1.5m1.5s", (1.5 * T_DAY) + (1.5 * T_HOUR) + (1.5 * T_MIN) + 1, T_NSEC * 0.5);
+
+ assert(counter == plan);
+ return err;
+}
diff --git a/test_strtodur.c b/test_strtodur.c
@@ -1,60 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Haelwenn (lanodan) Monnier <contact+cmd-timer@hacktivis.me>
-// SPDX-License-Identifier: MIT
-
-#define _POSIX_C_SOURCE 200809L
-#include "timer.h"
-
-#include <assert.h>
-#include <stdio.h>
-
-int counter = 0;
-int err = 0;
-
-static void
-t(char *str, unsigned long exp)
-{
- int id = ++counter;
-
- unsigned long res = strtodur(str);
- if(res == exp)
- {
- printf("ok %d - %s -> %ld\n", id, str, res);
- return;
- }
-
- err = 1;
- printf("not ok %d - %s -> %ld\n", id, str, res);
- printf("# Expected: %ld\n", exp);
-}
-
-int
-main()
-{
- int plan = 13;
- printf("1..%d\n", plan);
-
-#define T_MIN 60
-#define T_HOUR 60 * T_MIN
-#define T_DAY 24 * T_HOUR
-
- t(NULL, 0);
- t("", 0);
-
- t("5", 5);
- t("5s", 5);
-
- t("5m", 5 * T_MIN);
- t("5m5s", (5 * T_MIN) + 5);
-
- t("5h", 5 * T_HOUR);
- t("5h5m", (5 * T_HOUR) + (5 * T_MIN));
- t("5h5m5s", (5 * T_HOUR) + (5 * T_MIN) + 5);
-
- t("5d", 5 * T_DAY);
- t("5d5h", (5 * T_DAY) + (5 * T_HOUR));
- t("5d5h5m", (5 * T_DAY) + (5 * T_HOUR) + (5 * T_MIN));
- t("5d5h5m5s", (5 * T_DAY) + (5 * T_HOUR) + (5 * T_MIN) + 5);
-
- assert(counter == plan);
- return err;
-}
diff --git a/timer.1 b/timer.1
@@ -1,5 +1,5 @@
.\" SPDX-FileCopyrightText: 2025 Haelwenn (lanodan) Monnier <contact+cmd-timer@hacktivis.me>
-.\" SPDX-License-Identifier: MIT
+.\" SPDX-License-Identifier: MPL-2.0
.Dd June 18, 2025
.Dt TIMER 1
.Os
@@ -20,7 +20,7 @@ at every
.Ar interval .
.Pp
.Ar interval
-is a string containing numbers, terminated by suffixes:
+is a string containing non-negative decimal numbers including floats, terminated by suffixes:
s for seconds, m for minutes, h for hours, d for days.
.br
If the final number doesn't have a suffix, seconds are assumed.
diff --git a/timer.c b/timer.c
@@ -1,8 +1,8 @@
// SPDX-FileCopyrightText: 2025 Haelwenn (lanodan) Monnier <contact+cmd-timer@hacktivis.me>
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: MPL-2.0
#define _POSIX_C_SOURCE 200809L
-#include "timer.h"
+#include "strtodur.h"
#include <errno.h>
#include <limits.h> // UINT_MAX
@@ -17,6 +17,8 @@
extern char **environ;
static char **args;
+const char *argv0 = "timer";
+
static void
sig_timer(int sig)
{
@@ -49,9 +51,14 @@ main(int argc, char *argv[])
bad_usage();
}
- unsigned long dur = strtodur(*argv);
+ struct timespec dur = {
+ .tv_sec = 0,
+ .tv_nsec = 0,
+ };
+
+ if(strtodur(*argv, &dur) != 0) return 1;
- if(dur == 0)
+ if(dur.tv_sec == 0 && dur.tv_nsec == 0)
{
fputs("timer: error: Got a duration of 0\n", stderr);
return 1;
diff --git a/timer.h b/timer.h
@@ -1,4 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Haelwenn (lanodan) Monnier <contact+cmd-timer@hacktivis.me>
-// SPDX-License-Identifier: MIT
-
-unsigned long strtodur(char *s);
