--- unzip60/list.c +++ unzip60/list.c @@ -97,7 +97,7 @@ int list_files(__G) /* return PK-type { int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL; #ifndef WINDLL - char sgn, cfactorstr[13]; + char sgn, cfactorstr[1+10+1+1]; /* %NUL */ int longhdr=(uO.vflag>1); #endif int date_format; @@ -389,9 +389,9 @@ int list_files(__G) /* return PK-type } #else /* !WINDLL */ if (cfactor == 100) - sprintf(cfactorstr, LoadFarString(CompFactor100)); + snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100)); else - sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor); + snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor); if (longhdr) Info(slide, 0, ((char *)slide, LoadFarString(LongHdrStats), FmZofft(G.crec.ucsize, "8", "u"), methbuf, @@ -471,9 +471,9 @@ int list_files(__G) /* return PK-type #else /* !WINDLL */ if (cfactor == 100) - sprintf(cfactorstr, LoadFarString(CompFactor100)); + snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100)); else - sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor); + snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor); if (longhdr) { Info(slide, 0, ((char *)slide, LoadFarString(LongFileTrailer), FmZofft(tot_ucsize, "8", "u"), FmZofft(tot_csize, "8", "u"), 59c'/>
AgeCommit message (Expand)Author
2024-12-06services: wireguard: Support lists of gexps for most fields....In order to support more flexibility in Wireguard configuration, ungexp the configuration fields directly instead of ungexp-splicing a sexp calculator. This allows for the fields to take arbitrary gexps instead of only strings which is particularly helpful for the Pre/Post Up/Down commands. * gnu/services/vpn.scm (wireguard-configuration-file): Ungexp configuration lists instead of ungexp-splicing the code surrounding them. * doc/guix.texi (VPN Services)[wireguard]: Document it. Change-Id: If074cbb78473b6fd34e0e4e990d2ed268001d6c7 Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Richard Sent
2024-12-06services: wireguard: Add the bootstrap-private-key? field....The syntax from using the private-key field is more convenient than writing a custom PreUp command (more formatting and preshared keys). Instead of trying to guess if private-key is/is not a file path, add an option to disable bootstrapping while still using private-key. * gnu/services/vpn.scm (<wireguard-configuration>): Add bootstrap-private-key?. (wireguard-activation): Check bootstrap-private-key? before bootstrapping. * doc/guix.texi (VPN Services)[wireguard]: Document it. Change-Id: I6ba71ad58b26743057a221a54a246369022f83a5 Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Richard Sent
2024-12-06services: wireguard: Make the private-key field optional....Users who retrieve the private-key via a PreUp field need to be able to disable the default retrieval mechanism. * gnu/services/vpn.scm (<wireguard-configuration>)[private-key]: Change comment. (wireguard-configuration-file): Conditionally serialize private-key. * gnu/services/vpn.scm (wireguard-activation): Do not create private-key if the field is #f. * doc/guix.texi (VPN Services)[wireguard-configuration]: Document it. Change-Id: Iac419809ae94eb76e97ff1f1749e2f4b3e65bb04 Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Richard Sent