Index: head/games/factor/factor.6 =================================================================== --- head/games/factor/factor.6 (revision 42356) +++ head/games/factor/factor.6 (revision 42357) @@ -1,121 +1,121 @@ .\" Copyright (c) 1989, 1993 .\" The Regents of the University of California. All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by .\" Landon Curt Noll. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: .\" This product includes software developed by the University of .\" California, Berkeley and its contributors. .\" 4. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" @(#)factor.6 8.1 (Berkeley) 5/31/93 .\" .\" .\" By: Landon Curt Noll chongo@toad.com, ...!{sun,tolsoft}!hoptoad!chongo .\" .\" chongo /\oo/\ .\" .TH FACTOR 6 "May 31, 1993" .UC 7 .SH NAME factor, primes \- factor a number, generate primes .SH SYNOPSIS .B factor -[h] [ number ] ... .PP .B primes -[h] [ start [ stop ]] .SH DESCRIPTION The .I factor -utility will factor integers between 0 and 4294967295 inclusive. -When a number is factored, it is printed, followed by a ``:'', -and the list of factors on a single line. -Factors are listed in ascending order, and are preceded by a space. -If a factor divides a value more than once, it will be printed -more than once. +utility will factor integers between 0 and ULONG_MAX (4294967295 on 32 +bit architectures, 18446744073709551615 on 64 bit ones), inclusive. +When a number is factored, it is printed, followed by a ``:'', and the +list of factors on a single line. Factors are listed in ascending +order, and are preceded by a space. If a factor divides a value more +than once, it will be printed more than once. .PP When .I factor is invoked with one or more arguments, each argument will be factored. .PP When .I factor is invoked with no arguments, .I factor reads numbers, one per line, from standard input, until end of file or error. Leading white-space and empty lines are ignored. Numbers may be preceded by a single - or +. Numbers are terminated by a non-digit character (such as a newline). After a number is read, it is factored. Input lines must not be longer than 255 characters. .PP The .I primes utility prints primes in ascending order, one per line, starting at or above .B start and continuing until, but not including .B stop. The .B start value must be at least 0 and not greater than .B stop.\& The .B stop value must not be greater than 4294967295. The default value of .B stop is 4294967295. .PP When the .I primes utility is invoked with no arguments, .B start is read from standard input. .B Stop is taken to be 4294967295. The .B start value may be preceded by a single +. The .B start value is terminated by a non-digit character (such as a newline). The input line must not be longer than 255 characters. .SH OPTIONS .LP .TP 8 .B \-h Print the results in hexadecimal rather than decimal. .SH DIAGNOSTICS Out of range or invalid input results in `ouch' being written to standard error. .SH BUGS .I Factor cannot handle the ``10 most wanted'' factor list, .I primes won't get you a world record. Index: head/games/factor/factor.c =================================================================== --- head/games/factor/factor.c (revision 42356) +++ head/games/factor/factor.c (revision 42357) @@ -1,207 +1,207 @@ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Landon Curt Noll. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #ifndef lint static char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint static char sccsid[] = "@(#)factor.c 8.4 (Berkeley) 5/4/95"; #endif /* not lint */ /* * factor - factor a number into primes * * By: Landon Curt Noll chongo@toad.com, ...!{sun,tolsoft}!hoptoad!chongo * * chongo /\oo/\ * * usage: * factor [number] ... * * The form of the output is: * * number: factor1 factor1 factor2 factor3 factor3 factor3 ... * * where factor1 < factor2 < factor3 < ... * * If no args are given, the list of numbers are read from stdin. */ #include #include #include #include #include #include #include #include "primes.h" /* * prime[i] is the (i-1)th prime. * * We are able to sieve 2^32-1 because this byte table yields all primes * up to 65537 and 65537^2 > 2^32-1. */ extern ubig prime[]; extern ubig *pr_limit; /* largest prime in the prime array */ int hflag; void pr_fact __P((ubig)); /* print factors of a value */ void usage __P((void)); int main(argc, argv) int argc; char *argv[]; { ubig val; int ch; char *p, buf[100]; /* > max number of digits. */ while ((ch = getopt(argc, argv, "h")) != -1) switch (ch) { case 'h': hflag++; break; case '?': default: usage(); } argc -= optind; argv += optind; /* No args supplied, read numbers from stdin. */ if (argc == 0) for (;;) { if (fgets(buf, sizeof(buf), stdin) == NULL) { if (ferror(stdin)) err(1, "stdin"); exit (0); } for (p = buf; isblank(*p); ++p); if (*p == '\n' || *p == '\0') continue; if (*p == '-') errx(1, "negative numbers aren't permitted."); errno = 0; val = strtoul(buf, &p, 0); if (errno) err(1, "%s", buf); if (*p != '\n') errx(1, "%s: illegal numeric format.", buf); pr_fact(val); } /* Factor the arguments. */ else for (; *argv != NULL; ++argv) { if (argv[0][0] == '-') errx(1, "negative numbers aren't permitted."); errno = 0; val = strtoul(argv[0], &p, 0); if (errno) err(1, "%s", argv[0]); if (*p != '\0') errx(1, "%s: illegal numeric format.", argv[0]); pr_fact(val); } exit(0); } /* * pr_fact - print the factors of a number * * If the number is 0 or 1, then print the number and return. * If the number is < 0, print -1, negate the number and continue * processing. * * Print the factors of the number, from the lowest to the highest. * A factor will be printed numtiple times if it divides the value * multiple times. * * Factors are printed with leading tabs. */ void pr_fact(val) ubig val; /* Factor this value. */ { ubig *fact; /* The factor found. */ /* Firewall - catch 0 and 1. */ if (val == 0) /* Historical practice; 0 just exits. */ exit(0); if (val == 1) { (void)printf("1: 1\n"); return; } /* Factor value. */ - (void)printf(hflag ? "0x%x:" : "%lu:", val); + (void)printf(hflag ? "0x%lx:" : "%lu:", val); for (fact = &prime[0]; val > 1; ++fact) { /* Look for the smallest factor. */ do { if (val % (long)*fact == 0) break; } while (++fact <= pr_limit); /* Watch for primes larger than the table. */ if (fact > pr_limit) { - (void)printf(hflag ? " 0x%x" : " %lu", val); + (void)printf(hflag ? " 0x%lx" : " %lu", val); break; } /* Divide factor out until none are left. */ do { - (void)printf(hflag ? " 0x%x" : " %lu", *fact); - val /= (long)*fact; - } while ((val % (long)*fact) == 0); + (void)printf(hflag ? " 0x%lx" : " %lu", *fact); + val /= *fact; + } while ((val % *fact) == 0); /* Let the user know we're doing something. */ (void)fflush(stdout); } (void)putchar('\n'); } void usage() { (void)fprintf(stderr, "usage: factor -h [value ...]\n"); exit (0); } Index: head/games/primes/primes.c =================================================================== --- head/games/primes/primes.c (revision 42356) +++ head/games/primes/primes.c (revision 42357) @@ -1,338 +1,338 @@ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Landon Curt Noll. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #ifndef lint static char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint static char sccsid[] = "@(#)primes.c 8.5 (Berkeley) 5/10/95"; #endif /* not lint */ /* * primes - generate a table of primes between two values * * By: Landon Curt Noll chongo@toad.com, ...!{sun,tolsoft}!hoptoad!chongo * * chongo /\oo/\ * * usage: * primes [start [stop]] * * Print primes >= start and < stop. If stop is omitted, * the value 4294967295 (2^32-1) is assumed. If start is * omitted, start is read from standard input. * * validation check: there are 664579 primes between 0 and 10^7 */ #include #include #include #include #include #include #include #include #include #include "primes.h" /* * Eratosthenes sieve table * * We only sieve the odd numbers. The base of our sieve windows are always * odd. If the base of table is 1, table[i] represents 2*i-1. After the * sieve, table[i] == 1 if and only iff 2*i-1 is prime. * * We make TABSIZE large to reduce the overhead of inner loop setup. */ char table[TABSIZE]; /* Eratosthenes sieve of odd numbers */ /* * prime[i] is the (i-1)th prime. * * We are able to sieve 2^32-1 because this byte table yields all primes * up to 65537 and 65537^2 > 2^32-1. */ extern ubig prime[]; extern ubig *pr_limit; /* largest prime in the prime array */ /* * To avoid excessive sieves for small factors, we use the table below to * setup our sieve blocks. Each element represents a odd number starting * with 1. All non-zero elements are factors of 3, 5, 7, 11 and 13. */ extern char pattern[]; extern int pattern_size; /* length of pattern array */ int hflag; void primes __P((ubig, ubig)); ubig read_num_buf __P((void)); void usage __P((void)); int main(argc, argv) int argc; char *argv[]; { ubig start; /* where to start generating */ ubig stop; /* don't generate at or above this value */ int ch; char *p; while ((ch = getopt(argc, argv, "h")) != -1) switch (ch) { case 'h': hflag++; break; case '?': default: usage(); } argc -= optind; argv += optind; start = 0; stop = BIG; /* * Convert low and high args. Strtoul(3) sets errno to * ERANGE if the number is too large, but, if there's * a leading minus sign it returns the negation of the * result of the conversion, which we'd rather disallow. */ switch (argc) { case 2: /* Start and stop supplied on the command line. */ if (argv[0][0] == '-' || argv[1][0] == '-') errx(1, "negative numbers aren't permitted."); errno = 0; start = strtoul(argv[0], &p, 0); if (errno) err(1, "%s", argv[0]); if (*p != '\0') errx(1, "%s: illegal numeric format.", argv[0]); errno = 0; stop = strtoul(argv[1], &p, 0); if (errno) err(1, "%s", argv[1]); if (*p != '\0') errx(1, "%s: illegal numeric format.", argv[1]); break; case 1: /* Start on the command line. */ if (argv[0][0] == '-') errx(1, "negative numbers aren't permitted."); errno = 0; start = strtoul(argv[0], &p, 0); if (errno) err(1, "%s", argv[0]); if (*p != '\0') errx(1, "%s: illegal numeric format.", argv[0]); break; case 0: start = read_num_buf(); break; default: usage(); } if (start > stop) errx(1, "start value must be less than stop value."); primes(start, stop); exit(0); } /* * read_num_buf -- * This routine returns a number n, where 0 <= n && n <= BIG. */ ubig read_num_buf() { ubig val; char *p, buf[100]; /* > max number of digits. */ for (;;) { if (fgets(buf, sizeof(buf), stdin) == NULL) { if (ferror(stdin)) err(1, "stdin"); exit(0); } for (p = buf; isblank(*p); ++p); if (*p == '\n' || *p == '\0') continue; if (*p == '-') errx(1, "negative numbers aren't permitted."); errno = 0; val = strtoul(buf, &p, 0); if (errno) err(1, "%s", buf); if (*p != '\n') errx(1, "%s: illegal numeric format.", buf); return (val); } } /* * primes - sieve and print primes from start up to and but not including stop */ void primes(start, stop) ubig start; /* where to start generating */ ubig stop; /* don't generate at or above this value */ { register char *q; /* sieve spot */ register ubig factor; /* index and factor */ register char *tab_lim; /* the limit to sieve on the table */ register ubig *p; /* prime table pointer */ register ubig fact_lim; /* highest prime for current block */ /* * A number of systems can not convert double values into unsigned * longs when the values are larger than the largest signed value. * We don't have this problem, so we can go all the way to BIG. */ if (start < 3) { start = (ubig)2; } if (stop < 3) { stop = (ubig)2; } if (stop <= start) { return; } /* * be sure that the values are odd, or 2 */ if (start != 2 && (start&0x1) == 0) { ++start; } if (stop != 2 && (stop&0x1) == 0) { ++stop; } /* * quick list of primes <= pr_limit */ if (start <= *pr_limit) { /* skip primes up to the start value */ for (p = &prime[0], factor = prime[0]; factor < stop && p <= pr_limit; factor = *(++p)) { if (factor >= start) { - printf(hflag ? "0x%x\n" : "%lu\n", factor); + printf(hflag ? "0x%lx\n" : "%lu\n", factor); } } /* return early if we are done */ if (p <= pr_limit) { return; } start = *pr_limit+2; } /* * we shall sieve a bytemap window, note primes and move the window * upward until we pass the stop point */ while (start < stop) { /* * factor out 3, 5, 7, 11 and 13 */ /* initial pattern copy */ factor = (start%(2*3*5*7*11*13))/2; /* starting copy spot */ memcpy(table, &pattern[factor], pattern_size-factor); /* main block pattern copies */ for (fact_lim=pattern_size-factor; fact_lim+pattern_size<=TABSIZE; fact_lim+=pattern_size) { memcpy(&table[fact_lim], pattern, pattern_size); } /* final block pattern copy */ memcpy(&table[fact_lim], pattern, TABSIZE-fact_lim); /* * sieve for primes 17 and higher */ /* note highest useful factor and sieve spot */ if (stop-start > TABSIZE+TABSIZE) { tab_lim = &table[TABSIZE]; /* sieve it all */ fact_lim = (int)sqrt( (double)(start)+TABSIZE+TABSIZE+1.0); } else { tab_lim = &table[(stop-start)/2]; /* partial sieve */ fact_lim = (int)sqrt((double)(stop)+1.0); } /* sieve for factors >= 17 */ factor = 17; /* 17 is first prime to use */ p = &prime[7]; /* 19 is next prime, pi(19)=7 */ do { /* determine the factor's initial sieve point */ q = (char *)(start%factor); /* temp storage for mod */ if ((long)q & 0x1) { q = &table[(factor-(long)q)/2]; } else { q = &table[q ? factor-((long)q/2) : 0]; } /* sive for our current factor */ for ( ; q < tab_lim; q += factor) { *q = '\0'; /* sieve out a spot */ } } while ((factor=(ubig)(*(p++))) <= fact_lim); /* * print generated primes */ for (q = table; q < tab_lim; ++q, start+=2) { if (*q) { - printf(hflag ? "0x%x\n" : "%lu\n", start); + printf(hflag ? "0x%lx\n" : "%lu\n", start); } } } } void usage() { (void)fprintf(stderr, "usage: primes [-h] [start [stop]]\n"); exit(1); }