|
21 | 21 | * |
22 | 22 | * |
23 | 23 | * IDENTIFICATION |
24 | | - * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.94 1998/11/06 15:54:47 thomas Exp $ |
| 24 | + * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.95 1998/11/15 07:09:13 tgl Exp $ |
25 | 25 | * |
26 | 26 | * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb |
27 | 27 | * |
@@ -2563,15 +2563,16 @@ dumpACL(FILE *fout, TableInfo tbinfo) |
2563 | 2563 | { |
2564 | 2564 | if (ACLlist[k].privledges!= (char*)NULL) |
2565 | 2565 | { |
| 2566 | +/* If you change this code, bear in mind fmtId() can be |
| 2567 | + * used only once per printf() call... |
| 2568 | + */ |
| 2569 | +fprintf(fout, |
| 2570 | +"GRANT %s on %s to ", |
| 2571 | +ACLlist[k].privledges,fmtId(tbinfo.relname)); |
2566 | 2572 | if (ACLlist[k].user== (char*)NULL) |
2567 | | -fprintf(fout, |
2568 | | -"GRANT %s on %s to PUBLIC;\n", |
2569 | | -ACLlist[k].privledges,fmtId(tbinfo.relname)); |
| 2573 | +fprintf(fout,"PUBLIC;\n"); |
2570 | 2574 | else |
2571 | | -fprintf(fout, |
2572 | | -"GRANT %s on %s to %s;\n", |
2573 | | -ACLlist[k].privledges,fmtId(tbinfo.relname), |
2574 | | -fmtId(ACLlist[k].user)); |
| 2575 | +fprintf(fout,"%s;\n",fmtId(ACLlist[k].user)); |
2575 | 2576 | } |
2576 | 2577 | } |
2577 | 2578 | } |
@@ -2851,23 +2852,21 @@ dumpIndices(FILE *fout, IndInfo *indinfo, int numIndices, |
2851 | 2852 |
|
2852 | 2853 | strcpy(id1,fmtId(indinfo[i].indexrelname)); |
2853 | 2854 | strcpy(id2,fmtId(indinfo[i].indrelname)); |
2854 | | -sprintf(q,"CREATE %s INDEX %s on %s using %s (", |
| 2855 | +fprintf(fout,"CREATE %s INDEX %s on %s using %s (", |
2855 | 2856 | (strcmp(indinfo[i].indisunique,"t")==0) ?"UNIQUE" :"", |
2856 | 2857 | id1, |
2857 | 2858 | id2, |
2858 | 2859 | indinfo[i].indamname); |
2859 | 2860 | if (funcname) |
2860 | 2861 | { |
2861 | | -sprintf(q,"%s %s (%s) %s );\n", |
2862 | | -q,fmtId(funcname),attlist,fmtId(classname[0])); |
| 2862 | +/* need 2 printf's here cuz fmtId has static return area */ |
| 2863 | +fprintf(fout," %s",fmtId(funcname)); |
| 2864 | +fprintf(fout," (%s) %s );\n",attlist,fmtId(classname[0])); |
2863 | 2865 | free(funcname); |
2864 | 2866 | free(classname[0]); |
2865 | 2867 | } |
2866 | 2868 | else |
2867 | | -sprintf(q,"%s %s );\n", |
2868 | | -q,attlist); |
2869 | | - |
2870 | | -fputs(q,fout); |
| 2869 | +fprintf(fout," %s );\n",attlist); |
2871 | 2870 | } |
2872 | 2871 | } |
2873 | 2872 |
|
|