Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › d70e938
Report only real errors in m_parse_flatsize().
jlaffaye committed 15 years ago
commit d70e938ac0b3c4f8e43f4eaf9489645910e6cfeb
parent 128d774
1 file changed +11 -3
modified libpkg/pkg_manifest.c
@@ -4,13 +4,15 @@
#include <assert.h>

#include <ctype.h>

#include <err.h>
+ 
#include <errno.h>

#include <inttypes.h>

#include <stdbool.h>

#include <stdlib.h>

#include <string.h>
- 
#include "pkg_util.h"

#include "pkg.h"
+ 
#include "pkg_error.h"
+ 
#include "pkg_util.h"

#include "pkg_private.h"



static int m_parse_name(struct pkg *pkg, char *buf);
@@ -126,10 +128,16 @@ m_parse_flatsize(struct pkg *pkg, char *buf)
{

	int64_t size;
+ 
	/*
+ 
	 * Set errno to 0 to make sure that the error we will eventually catch
+ 
	 * later was setted bt strtoimax()
+ 
	 */
+ 
	errno = 0;

	size = strtoimax(buf, NULL, 10);
- 
	if (size <= 0)
- 
		return (EPKG_FATAL);
+ 
	if (errno == EINVAL || errno == ERANGE)
+ 
		return (pkg_error_set(EPKG_FATAL, "m_parse_flatsize(): %s",
+ 
				strerror(errno)));



	pkg_setflatsize(pkg, size);

	return (EPKG_OK);