IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Christopher Lam 2023-02-05 12:09:38 +08:00
commit 85c2491664
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnucash/report/commodity-utilities.scm
View File

@ -700,7 +700,8 @@
(gnc:make-gnc-monetary
domestic
(if pair
(* (gnc:gnc-monetary-amount foreign) (cadr pair))
(gnc-numeric-mul (gnc:gnc-monetary-amount foreign) (cadr pair)
GNC-DENOM-AUTO GNC-RND-ROUND)
0)))))))
;; This is another ready-to-use function for calculation of exchange
@ -780,7 +781,9 @@
(plist (assoc-ref pricealist foreign-comm))
(price (and plist
(gnc:pricelist-price-find-nearest plist date))))
(gnc:make-gnc-monetary domestic (* foreign-amt (or price 0)))))))
(gnc:make-gnc-monetary domestic
(gnc-numeric-mul foreign-amt (or price 0)
GNC-DENOM-AUTO GNC-RND-ROUND))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

15
libgnucash/app-utils/file-utils.c
View File

@ -62,7 +62,7 @@ gncReadFile (const char * filename, char ** data)
{
char *buf = NULL;
char *fullname;
int size = 0;
off_t size = 0;
int fd;
if (!filename || filename[0] == '\0') return 0;
@ -89,18 +89,25 @@ gncReadFile (const char * filename, char ** data)
size = lseek( fd, 0, SEEK_END );
lseek( fd, 0, SEEK_SET );
if (size < 0)
{
int norr = errno;
PERR ("file seek-to-end %s: (%d) %s\n", filename, norr, strerror(norr));
return 0;
}
/* Allocate memory */
buf = g_new(char, size + 1);
buf = g_new(char, (size_t)size + 1);
/* read in file */
if ( read(fd, buf, size) == -1 )
if ( read(fd, buf, (size_t)size) == -1 )
{
g_free(buf);
buf = NULL;
}
else
{
buf[size] = '\0';
buf[(size_t)size] = '\0';
}
close(fd);